Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 12:35:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1929

Browse Source
This commit is contained in:
Jesse Boyd 2018-05-07 10:44:16 +10:00
parent 9a7ce84e1c
commit 59e06c2319
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 6 additions and 0 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

@ -2378,6 +2378,10 @@ public class PlayerEvents extends PlotListener implements Listener {
if (shooter instanceof Player) { // shooter is player if (shooter instanceof Player) { // shooter is player
player = (Player) shooter; player = (Player) shooter;
} else { // shooter is not player } else { // shooter is not player
if (shooter instanceof BlockProjectileSource) {
Location sLoc = BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
dplot = dArea.getPlot(sLoc);
}
player = null; player = null;
} }
} else { // Attacker is not player } else { // Attacker is not player
@ -2452,6 +2456,8 @@ public class PlayerEvents extends PlotListener implements Listener {
} }
} }
return true; return true;
} else if (dplot != null && (!(dplot.equals(vplot)) || (vplot != null && dplot.isOwner(vplot.owner)))) {
return false;
} }
// player is null // player is null
return !(damager instanceof Arrow && !(victim instanceof Creature)); return !(damager instanceof Arrow && !(victim instanceof Creature));