Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-06 00:58:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1988

Browse Source
This commit is contained in:
Jesse Boyd 2018-06-23 14:12:21 +10:00
parent 9020d740d1
commit 1772fdab16
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -2370,6 +2370,7 @@ public class PlayerEvents extends PlotListener implements Listener {
}
}
}
System.out.println("Cancel entity damage");
event.setCancelled(true);
}
}
@ -2512,10 +2513,9 @@ public class PlayerEvents extends PlotListener implements Listener {
}
return true;
} else if (dplot != null && (!(dplot.equals(vplot)) || (vplot != null && Objects.equals(dplot.owner, vplot.owner)))) {
return false;
return vplot != null && Flags.PVE.isTrue(vplot);
}
// player is null
return !(damager instanceof Arrow && !(victim instanceof Creature));
return ((vplot != null && Flags.PVE.isTrue(vplot)) || !(damager instanceof Arrow && !(victim instanceof Creature)));
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)