From 9dfb3bb94193a2bbc00752bf80ce969fbda87582 Mon Sep 17 00:00:00 2001 From: "Alex \"mcmonkey\" Goodwin" Date: Wed, 24 Nov 2021 12:28:21 -0800 Subject: [PATCH] avoid unnecessary call to location_flagged --- .../com/denizenscript/denizen/events/BukkitScriptEvent.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java index a0b2948c17..ffb8299bfa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java @@ -645,6 +645,9 @@ public static boolean runFlaggedCheck(ScriptPath path, String switchName, Abstra } public boolean runLocationFlaggedCheck(ScriptPath path, String switchName, Location location) { + if (!path.switches.containsKey(switchName)) { // NOTE: opti to avoid 'getFlagTracker' call, also prevents pre-1.16 borks + return true; + } return runFlaggedCheck(path, switchName, location == null ? null : new LocationTag(location).getFlagTracker()); }