entity damage match conflict reduction

DenizenScript · Jan 11, 2021 · cb809c7 · cb809c7
1 parent 2c5849d
commit cb809c7
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -84,7 +84,20 @@ public EntityDamagedScriptEvent() {
     @Override
     public boolean couldMatch(ScriptPath path) {
         String cmd = path.eventArgLowerAt(1);
-        if (!cmd.equals("damaged") && !cmd.equals("damages")) {
+        if (cmd.equals("damaged")) {
+            if (path.eventArgLowerAt(0).equals("vehicle")) {
+                return false;
+            }
+        }
+        else if (cmd.equals("damages")) {
+            if (!couldMatchEntity(path.eventArgLowerAt(2))) {
+                return false;
+            }
+            if (path.eventArgLowerAt(2).equals("vehicle")) {
+                return false;
+            }
+        }
+        else {
             return false;
         }
         if (!couldMatchEntity(path.eventArgLowerAt(0))) {