Let "on entity damaged by projectile" <context.shooter> be dPlayers a…

…nd dNPCs
DenizenScript · Aug 17, 2013 · 38d6c4d · 38d6c4d
1 parent b55f68a
commit 38d6c4d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -14,6 +14,8 @@
 import net.aufdemrand.denizen.utilities.entity.Position;
 import net.aufdemrand.denizen.utilities.Utilities;
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.npc.NPC;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -600,8 +602,14 @@ else if (damager.isPlayer()) {
                 context.put("damager", damager);
 
                 if (damager instanceof Projectile) {
-                    if (((Projectile) damager).getShooter() != null)
-                        context.put("shooter", new dEntity(((Projectile) damager).getShooter()));
+                    if (((Projectile) damager).getShooter() != null) {
+                        if (((Projectile) damager).getShooter() instanceof Player)
+                            context.put("shooter", new dPlayer((Player) ((Projectile) damager).getShooter()));
+                        else if (((Projectile) damager).getShooter() instanceof NPC)
+                            context.put("shooter", new dNPC((NPC) ((Projectile) damager).getShooter()));
+                        else
+                            context.put("shooter", new dEntity(((Projectile) damager).getShooter()));
+                    }
                     else
                         context.put("shooter", Element.valueOf("null"));
                 }