From d43cff88db6a20dbf5efc8af0f4c902a014643c4 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Tue, 17 Mar 2015 22:34:53 +1100
Subject: [PATCH] Remove arrow on cancel

---
 PlotSquared/pom.xml                                  |  1 -
 .../plot/listeners/PlayerEvents.java                 | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index ff6f30347..b2d836294 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -36,7 +36,6 @@
             </resource>
         </resources>
         <plugins>
-              
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
index 87c0af62d..71595bf27 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
@@ -14,7 +14,6 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
-import org.bukkit.block.Dispenser;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Creature;
@@ -22,7 +21,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LargeFireball;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -1103,13 +1101,15 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
         }
         if (isPlotWorld(l)) {
             Player p = null;
+            Projectile projectile = null;
             if (damager instanceof Player) {
                 p = (Player) damager;
             }
             else if (damager instanceof Projectile) {
+                projectile = (Projectile) damager;
                 //Arrow, Egg, EnderPearl, Fireball, Fish, FishHook, LargeFireball, SmallFireball, Snowball, ThrownExpBottle, ThrownPotion, WitherSkull
                 if (damager instanceof Arrow || damager instanceof LargeFireball || damager instanceof Fireball || damager instanceof SmallFireball) {
-                    ProjectileSource shooter = ((Projectile) damager).getShooter();
+                    ProjectileSource shooter = projectile.getShooter();
                     if (shooter == null || !(shooter instanceof Player)) {
                         return;
                     }
@@ -1155,6 +1155,9 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                         final PlotPlayer pp = BukkitUtil.getPlayer(p);
                         if (!Permissions.hasPermission(pp, "plots.admin.pve.unowned")) {
                             MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.pve.unowned");
+                            if (projectile != null) {
+                                projectile.remove();
+                            }
                             e.setCancelled(true);
                             return;
                         }
@@ -1179,6 +1182,9 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                         if (!Permissions.hasPermission(pp, "plots.admin.pve.other")) {
                             if (isPlotArea(l)) {
                                 MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.pve.other");
+                                if (projectile != null) {
+                                    projectile.remove();
+                                }
                                 e.setCancelled(true);
                                 return;
                             }