area enter event: ignore portal, bed, vehicle

DenizenScript · Jul 2, 2020 · b12fc36 · b12fc36
1 parent 3fb6672
commit b12fc36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java
@@ -85,7 +85,7 @@ public boolean couldMatchEntity(String text) {
         return genericCouldMatchChecks(text, this::couldMatchEntity);
     }
 
-    public boolean couldMatchVehicle(String text) {
+    public boolean exactMatchesVehicle(String text) {
         if (text.equals("vehicle")) {
             return true;
         }
@@ -102,6 +102,13 @@ public boolean couldMatchVehicle(String text) {
             }
             return true;
         }
+        return false;
+    }
+
+    public boolean couldMatchVehicle(String text) {
+        if (exactMatchesVehicle(text)) {
+            return true;
+        }
         return genericCouldMatchChecks(text, this::couldMatchVehicle);
     }
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/AreaEnterExitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/AreaEnterExitScriptEvent.java
@@ -66,6 +66,12 @@ public boolean couldMatch(ScriptPath path) {
         if (path.eventArgLowerAt(2).equals("biome") || exactMatchesEnum(path.eventArgLowerAt(2), Biome.values())) {
             return false;
         }
+        if (exactMatchesVehicle(path.eventArgLowerAt(2))) {
+            return false;
+        }
+        if (path.eventArgLowerAt(2).equals("bed") || path.eventArgLowerAt(2).equals("portal")) {
+            return false;
+        }
         return true;
     }