Fix projectile identifying in EntityDamaged

DenizenScript · Jun 24, 2015 · 41fa075 · 41fa075
1 parent e77cdca
commit 41fa075
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -100,7 +100,11 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String target = cmd.equals("damages") ? CoreUtilities.getXthArg(2, lower): CoreUtilities.getXthArg(0, lower);
         if (attacker.length() > 0) {
             if (damager != null) {
-                if( !damager.matchesEntity(attacker) && !cause.asString().equals(attacker)) {
+                boolean projectileMatched = false;
+                if (projectile != null) {
+                    projectileMatched = projectile.matchesEntity(attacker);
+                }
+                if (!projectileMatched && !damager.matchesEntity(attacker) && !cause.asString().equals(attacker)) {
                     return false;
                 }
             }