match core updates

DenizenScript · Apr 29, 2022 · 97ab35f · 97ab35f
1 parent c5f4e6a
commit 97ab35f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java
@@ -95,7 +95,7 @@ public void execute(ScriptEntry scriptEntry) {
             defValues.append(escape(def.getValue().toString())).append("\n");
         }
         RunCommandsPacketOut packetScript = new RunCommandsPacketOut(toSend.toString(),
-                defNames.toString() + "\r" + defValues.toString(), scriptEntry.shouldDebug(),
+                defNames + "\r" + defValues, scriptEntry.shouldDebug(),
                 Utilities.entryHasPlayer(scriptEntry) ?
                 Utilities.getEntryPlayer(scriptEntry).getUUID()
                 : new UUID(0, 0));

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java
@@ -125,7 +125,7 @@ public void execute(ScriptEntry scriptEntry) {
                 : new UUID(0, 0);
         packetTag.tag = tag.asString();
         packetTag.id = newId;
-        packetTag.defs = defNames.toString() + "\r" + defValues.toString();
+        packetTag.defs = defNames + "\r" + defValues;
         RedirectPacketOut packet = new RedirectPacketOut(server.asString(), packetTag);
         BungeeBridge.instance.sendPacket(packet);
         BungeeBridge.instance.sendPacket(new KeepAlivePacketOut());

diff --git a/...main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java b/...main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java
@@ -75,7 +75,7 @@ public boolean matches(ScriptPath path) {
         if (!spellName.equals("spell") && !spellName.equalsIgnoreCase(spell.asString())) {
             return false;
         }
-        if (!tryEntity(caster, path.eventArgLowerAt(1))) {
+        if (!caster.tryAdvancedMatcher(path.eventArgLowerAt(1))) {
             return false;
         }
         return super.matches(path);

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastedScriptEvent.java b/...in/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastedScriptEvent.java
@@ -66,7 +66,7 @@ public boolean couldMatch(ScriptPath path) {
 
     @Override
     public boolean matches(ScriptPath path) {
-        if (!tryEntity(caster, path.eventArgLowerAt(1))) {
+        if (!caster.tryAdvancedMatcher(path.eventArgLowerAt(1))) {
             return false;
         }
         return super.matches(path);

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java
@@ -63,10 +63,10 @@ public boolean matches(ScriptPath path) {
         if (!mob.equals("mob") && !runGenericCheck(mob, mythicmob.getMobType().getInternalName())) {
             return false;
         }
-        if ((path.eventArgLowerAt(3).equals("by")) && (killer == null || !tryEntity(killer, path.eventArgLowerAt(4)))) {
+        if ((path.eventArgLowerAt(3).equals("by")) && (killer == null || !killer.tryAdvancedMatcher(path.eventArgLowerAt(4)))) {
             return false;
         }
-        if (path.switches.containsKey("by") && (killer == null || !tryEntity(killer, path.switches.get("by")))) {
+        if (path.switches.containsKey("by") && (killer == null || !killer.tryAdvancedMatcher(path.switches.get("by")))) {
             return false;
         }
         if (!runInCheck(path, entity.getLocation()) && (killer == null || !runInCheck(path, killer.getLocation()))) {

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/events/sentinel/SentinelAttackScriptEvent.java b/...in/java/com/denizenscript/depenizen/bukkit/events/sentinel/SentinelAttackScriptEvent.java
@@ -54,7 +54,7 @@ public String getName() {
 
     @Override
     public boolean matches(ScriptPath path) {
-        if (path.switches.containsKey("entity") && !tryEntity(entity, path.switches.get("entity"))) {
+        if (path.switches.containsKey("entity") && !entity.tryAdvancedMatcher(path.switches.get("entity"))) {
             return false;
         }
         return super.matches(path);

diff --git a/...a/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaimTag.java b/...a/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaimTag.java
@@ -51,7 +51,7 @@ public static GriefPreventionClaimTag valueOf(String id, TagContext context) {
         long claimID;
         id = id.replace("gpclaim@", "");
         try {
-            claimID = Long.valueOf(id);
+            claimID = Long.parseLong(id);
         }
         catch (NumberFormatException e) {
             return null;