From ae935300c02b3ea0591f217b87bbce7181b81563 Mon Sep 17 00:00:00 2001 From: mcmonkey Date: Fri, 18 Jan 2019 04:27:12 -0800 Subject: [PATCH] third-pass: update runWithCheck and calls to it --- .../denizen/events/BukkitScriptEvent.java | 15 ++++++++++++--- .../events/entity/EntityDamagedScriptEvent.java | 2 +- .../player/PlayerBreaksBlockScriptEvent.java | 2 +- .../player/PlayerClicksBlockScriptEvent.java | 2 +- .../PlayerRightClicksAtEntityScriptEvent.java | 2 +- .../PlayerRightClicksEntityScriptEvent.java | 2 +- 6 files changed, 17 insertions(+), 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 index ef9a415a95..6b612e8892 100644 --- 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 index a766ecc01a..9b16366c21 100644 --- 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 index 7e45404a34..38e506d11e 100644 --- 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 index 8fb1fa639f..b181f8e3de 100644 --- 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/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java index 2db47ee654..a0107f5db9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java +++ b/plugin/src/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/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java index d866247e8b..6ce2a94615 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java +++ b/plugin/src/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