Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 13:05:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
boy0001 2015-07-17 13:52:44 +10:00
parent f471a05dcd
commit 82db8d6bdb
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -1747,9 +1747,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (plot != null) { if (plot != null) {
Flag pvp = FlagManager.getPlotFlag(plot, "pvp"); Flag pvp = FlagManager.getPlotFlag(plot, "pvp");
if (pvp == null) { if (pvp == null) {
if (victim.getTicksLived() > damager.getTicksLived() ? plot.isAdded(BukkitUtil.getPlayer((Player) victim).getUUID()) : plot.isAdded(pp.getUUID())) {
return; return;
}
} else { } else {
if ((Boolean) pvp.getValue()) { if ((Boolean) pvp.getValue()) {
return; return;