deny non-noted cuboids for in:area switch

DenizenScript · Oct 3, 2019 · 572da3b · 572da3b
1 parent 72f7e47
commit 572da3b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java
@@ -259,10 +259,18 @@ else if (WorldTag.matches(it)) {
         }
         else if (CuboidTag.matches(it)) {
             CuboidTag cuboid = CuboidTag.valueOf(it);
+            if (cuboid == null || !cuboid.isUnique()) {
+                Debug.echoError("Invalid event 'in:<area>' switch [" + getName() + "] (invalid cuboid): '" + path.event + "' for " + path.container.getName());
+                return false;
+            }
             return cuboid.isInsideCuboid(location);
         }
         else if (EllipsoidTag.matches(it)) {
             EllipsoidTag ellipsoid = EllipsoidTag.valueOf(it);
+            if (ellipsoid == null || !ellipsoid.isUnique()) {
+                Debug.echoError("Invalid event 'in:<area>' switch [" + getName() + "] (invalid ellipsoid): '" + path.event + "' for " + path.container.getName());
+                return false;
+            }
             return ellipsoid.contains(location);
         }
         else {