third-pass: update runWithCheck and calls to it

DenizenScript · Jan 18, 2019 · ae93530 · ae93530
1 parent 1d50612
commit ae93530
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/BukkitScriptEvent.java
@@ -1,9 +1,11 @@
 package net.aufdemrand.denizen.events;
 
 import net.aufdemrand.denizen.objects.*;
+import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizencore.tags.TagContext;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -90,15 +92,22 @@ public boolean tryLocation(dLocation location, String comparedto) {
         return loc.getBlock().equals(location.getBlock());
     }
 
+    @Deprecated
     public boolean runWithCheck(ScriptContainer scriptContainer, String s, String lower, dItem held) {
-        String with = getSwitch(lower, "with");
+        return runWithCheck(new ScriptPath(scriptContainer, s), held);
+    }
+
+    public static TagContext noDebugTagContext = new BukkitTagContext(null, null, false, null, false, null);
+
+    public boolean runWithCheck(ScriptPath path, dItem held) {
+        String with = path.switches.get("with");
         if (with != null) {
             if (with.equals("item")) {
                 return true;
             }
-            dItem it = dItem.valueOf(with);
+            dItem it = dItem.valueOf(with, noDebugTagContext);
             if (it == null) {
-                dB.echoError("Invalid WITH item in " + getName() + " for '" + s + "' in " + scriptContainer.getName());
+                dB.echoError("Invalid WITH item in " + getName() + " for '" + path.event + "' in " + path.container.getName());
                 return false;
             }
             if (held == null || !tryItem(held, with)) {

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -118,7 +118,7 @@ public boolean matches(ScriptPath path) {
             return false;
         }
 
-        if (!runWithCheck(scriptContainer, s, lower, held)) {
+        if (!runWithCheck(path, held)) {
             return false;
         }
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java
@@ -76,7 +76,7 @@ public boolean matches(ScriptPath path) {
         if (!runInCheck(path, location)) {
             return false;
         }
-        if (!runWithCheck(scriptContainer, s, lower, new dItem(event.getPlayer().getItemInHand()))) {
+        if (!runWithCheck(path, new dItem(event.getPlayer().getItemInHand()))) {
             return false;
         }
         // Deprecated in favor of with: format

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java
@@ -148,7 +148,7 @@ public boolean matches(ScriptPath path) {
             return false;
         }
 
-        if (!runWithCheck(scriptContainer, s, lower, new dItem(event.getItem()))) {
+        if (!runWithCheck(path, new dItem(event.getItem()))) {
             return false;
         }
 

diff --git a/.../main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java b/.../main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java
@@ -66,7 +66,7 @@ public boolean matches(ScriptPath path) {
         if (!runInCheck(path, event.getPlayer().getLocation())) {
             return false;
         }
-        if (!runWithCheck(scriptContainer, s, lower, new dItem(event.getPlayer().getItemInHand()))) {
+        if (!runWithCheck(path, new dItem(event.getPlayer().getItemInHand()))) {
             return false;
         }
         // Deprecated in favor of with: format

diff --git a/...rc/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/...rc/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java
@@ -68,7 +68,7 @@ public boolean matches(ScriptPath path) {
         if (!runInCheck(path, event.getPlayer().getLocation())) {
             return false;
         }
-        if (!runWithCheck(scriptContainer, s, lower, new dItem(event.getPlayer().getItemInHand()))) {
+        if (!runWithCheck(path, new dItem(event.getPlayer().getItemInHand()))) {
             return false;
         }
         // Deprecated in favor of with: format