From a1e9d170002f5e1e8aa7fcb19d4e35a7805cfa1b Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Wed, 3 Feb 2021 08:29:37 -0800 Subject: [PATCH] a few small bugfixes --- .../denizen/objects/EntityTag.java | 5 ---- .../denizen/objects/PlayerTag.java | 3 +- .../scripts/triggers/core/ChatTrigger.java | 29 +++++++++---------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java index 0d43052bc1..bf8ebf4e40 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java @@ -2517,11 +2517,6 @@ else if (object.getBukkitEntity() instanceof Hanging) { }); } - public String describe() { - String escript = getEntityScript(); - return "e@" + (escript != null && escript.length() > 0 ? escript : getEntityType().getLowercaseName()) + PropertyParser.getPropertiesString(this); - } - public static ObjectTagProcessor tagProcessor = new ObjectTagProcessor<>(); public static void registerSpawnedOnlyTag(String name, TagRunnable.ObjectInterface runnable, String... variants) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java index c8327a78f3..43f4ee2113 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java @@ -778,7 +778,8 @@ public static void registerTags() { if (CoreUtilities.equalsIgnoreCase(val, e.getType().name())) { return true; } - if (CoreUtilities.equalsIgnoreCase(val, ent.getEntityScript())) { + String script = ent.getEntityScript(); + if (script != null && CoreUtilities.equalsIgnoreCase(val, script)) { return true; } EntityTag match = EntityTag.valueOf(val, CoreUtilities.noDebugContext); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java index 8248422e63..2b6a04faeb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java @@ -4,7 +4,7 @@ import com.denizenscript.denizen.scripts.containers.core.InteractScriptContainer; import com.denizenscript.denizen.scripts.containers.core.InteractScriptHelper; import com.denizenscript.denizen.utilities.Utilities; -import com.denizenscript.denizen.utilities.debugging.Debug; +import com.denizenscript.denizencore.utilities.debugging.Debug; import com.denizenscript.denizen.utilities.Settings; import com.denizenscript.denizen.nms.NMSHandler; import com.denizenscript.denizen.npc.traits.TriggerTrait; @@ -37,7 +37,6 @@ public class ChatTrigger extends AbstractTrigger implements Listener { final static Pattern triggerPattern = Pattern.compile("/([^/]*)/"); - final static boolean HyperDebug = false; // TODO: Replace with core->dB.verbose! // <--[language] // @name Chat Triggers @@ -117,7 +116,7 @@ public ChatContext process(Player player, String message) { NPCTag npc = Utilities.getClosestNPC_ChatTrigger(player.getLocation(), 25); PlayerTag denizenPlayer = PlayerTag.mirrorBukkitPlayer(player); - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Processing chat trigger: valid npc? " + (npc != null)); } // No NPC? Nothing else to do here. @@ -125,7 +124,7 @@ public ChatContext process(Player player, String message) { return new ChatContext(false); } - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Has trait? " + npc.getCitizen().hasTrait(TriggerTrait.class)); } // If the NPC doesn't have triggers, or the triggers are not enabled, then @@ -133,7 +132,7 @@ public ChatContext process(Player player, String message) { if (!npc.getCitizen().hasTrait(TriggerTrait.class)) { return new ChatContext(false); } - if (HyperDebug) { + if (Debug.verbose) { Debug.log("enabled? " + npc.getCitizen().getOrAddTrait(TriggerTrait.class).isEnabled(name)); } if (!npc.getCitizen().getOrAddTrait(TriggerTrait.class).isEnabled(name)) { @@ -142,7 +141,7 @@ public ChatContext process(Player player, String message) { // Check range if (npc.getTriggerTrait().getRadius(name) < npc.getLocation().distance(player.getLocation())) { - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Not in range"); } return new ChatContext(false); @@ -155,7 +154,7 @@ public ChatContext process(Player player, String message) { if (Settings.chatMustSeeNPC()) { if (!player.hasLineOfSight(npc.getEntity())) { - if (HyperDebug) { + if (Debug.verbose) { Debug.log("no LOS"); } return new ChatContext(false); @@ -164,7 +163,7 @@ public ChatContext process(Player player, String message) { if (Settings.chatMustLookAtNPC()) { if (!NMSHandler.getEntityHelper().isFacingEntity(player, npc.getEntity(), 45)) { - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Not facing"); } return new ChatContext(false); @@ -190,7 +189,7 @@ public ChatContext process(Player player, String message) { // Return false if determine cancelled if (trigger.hasDetermination()) { if (trigger.getDetermination().equalsIgnoreCase("cancelled")) { - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Cancelled"); } // Mark as handled, the event will cancel. @@ -219,7 +218,7 @@ public ChatContext process(Player player, String message) { } if (script == null) { - if (HyperDebug) { + if (Debug.verbose) { Debug.log("null script"); } return new ChatContext(message, false); @@ -244,7 +243,7 @@ public ChatContext process(Player player, String message) { return new ChatContext(false); } else { - if (HyperDebug) { + if (Debug.verbose) { Debug.log("No trigger in step, chatting globally"); } return new ChatContext(message, ret); @@ -366,7 +365,7 @@ else if (messageLow.contains(keywordLow)) { Utilities.talkToNPC(replacementText, denizenPlayer, npc, Settings.chatToNpcOverhearingRange(), new ScriptTag(script)); } parse(npc, denizenPlayer, script, id, context); - if (HyperDebug) { + if (Debug.verbose) { Debug.log("chat to NPC"); } return new ChatContext(!showNormalChat.equalsIgnoreCase("true")); @@ -374,7 +373,7 @@ else if (messageLow.contains(keywordLow)) { else { if (!Settings.chatGloballyIfFailedChatTriggers()) { Utilities.talkToNPC(message, denizenPlayer, npc, Settings.chatToNpcOverhearingRange(), new ScriptTag(script)); - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Chat globally"); } return new ChatContext(!showNormalChat.equalsIgnoreCase("true")); @@ -382,7 +381,7 @@ else if (messageLow.contains(keywordLow)) { // No matching chat triggers, and the config.yml says we // should just ignore the interaction... } - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Finished calculating"); } return new ChatContext(message, ret); @@ -390,7 +389,7 @@ else if (messageLow.contains(keywordLow)) { @EventHandler public void asyncChatTrigger(final AsyncPlayerChatEvent event) { - if (HyperDebug) { + if (Debug.verbose) { Debug.log("Chat trigger seen, cancelled: " + event.isCancelled() + ", chatasync: " + Settings.chatAsynchronous()); }