version ref upd, and matches logic fix (for compat with core change)

DenizenScript · Oct 3, 2020 · c0f4217 · c0f4217
1 parent b96b69a
commit c0f4217
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,8 +13,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.16.2-R0.1-SNAPSHOT</bukkit.version>
-        <denizen.version>1.1.6-SNAPSHOT</denizen.version>
+        <bukkit.version>1.16.3-R0.1-SNAPSHOT</bukkit.version>
+        <denizen.version>1.1.7-SNAPSHOT</denizen.version>
     </properties>
 
     <issueManagement>

diff --git a/src/main/java/space/morphanone/webizen/events/BasicRequestScriptEvent.java b/src/main/java/space/morphanone/webizen/events/BasicRequestScriptEvent.java
@@ -1,12 +1,12 @@
 package space.morphanone.webizen.events;
 
+import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizencore.objects.core.MapTag;
 import com.sun.net.httpserver.HttpExchange;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
 import com.denizenscript.denizen.tags.BukkitTagContext;
 import com.denizenscript.denizen.utilities.DenizenAPI;
-import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
@@ -28,7 +28,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public abstract class BasicRequestScriptEvent extends ScriptEvent {
+public abstract class BasicRequestScriptEvent extends BukkitScriptEvent {
 
     public HttpExchange httpExchange;
 
@@ -104,12 +104,10 @@ else if (scriptResponse.parseFile.asBoolean()) {
 
     @Override
     public boolean couldMatch(ScriptPath path) {
-        return path.eventLower.startsWith(lowerRequestType + " ");
-    }
-
-    @Override
-    public boolean matches(ScriptPath path) {
-        return path.eventArgLowerAt(1).equals("request");
+        if (!path.eventLower.startsWith(lowerRequestType + " request")) {
+            return false;
+        }
+        return true;
     }
 
     @Override