fix compat for core update (server_flagged)

DenizenScript · Oct 3, 2020 · ea6132b · ea6132b
1 parent a0046ee
commit ea6132b
Show file tree

Hide file tree

Showing 2 changed files with 6 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
@@ -582,7 +582,7 @@ public boolean matches(ScriptPath path) {
         if (!runAutomaticPlayerSwitches(path)) {
             return false;
         }
-        return true;
+        return super.matches(path);
     }
 
     // <--[language]

diff --git a/...in/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/...in/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
@@ -273,6 +273,11 @@ else if (arg.indexOf('@') == 2) {
         return flag;
     }
 
+    @Override
+    public boolean serverHasFlag(String flag) {
+        return FlagManager.serverHasFlag(flag);
+    }
+
     @Override
     public TagContext getTagContext(ScriptContainer container) {
         return new BukkitTagContext(container);