diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java index a68ce2a55a..a9b964a446 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java @@ -33,10 +33,8 @@ public class EntityDamagedScriptEvent extends BukkitScriptEvent implements Liste // <--[event] // @Events - // entity damaged (in ) (with:) - // entity damaged by (in ) (with:) - // damaged (in ) (with:) - // damaged by (in ) (with:) + // entity damaged (by ) (in ) (with:) + // damaged (by ) (in ) (with:) // entity damages entity (in ) (with:) // entity damages (in ) (with:) // entity damaged by entity (in ) (with:) @@ -90,8 +88,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { public boolean matches(ScriptContainer scriptContainer, String s) { String lower = CoreUtilities.toLowerCase(s); String cmd = CoreUtilities.getXthArg(1, lower); - String attacker = cmd.equals("damages") ? CoreUtilities.getXthArg(0, lower) : CoreUtilities.getXthArg(3, lower); + String attacker = cmd.equals("damages") ? CoreUtilities.getXthArg(0, lower) : + CoreUtilities.getXthArg(2, lower).equals("by") ? CoreUtilities.getXthArg(3, lower) : ""; String target = cmd.equals("damages") ? CoreUtilities.getXthArg(2, lower) : CoreUtilities.getXthArg(0, lower); + if (attacker.length() > 0) { if (damager != null) { boolean projectileMatched = false;