Trigger command: error on invalid trigger name

DenizenScript · Nov 28, 2022 · d096ac0 · d096ac0
1 parent 640c909
commit d096ac0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/TriggerTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/TriggerTrait.java
@@ -26,7 +26,7 @@
 public class TriggerTrait extends Trait implements Listener {
 
     @Persist(value = "enabled", collectionType = HashMap.class)
-    private Map<String, Boolean> enabled = new HashMap<>();
+    public Map<String, Boolean> enabled = new HashMap<>();
     @Persist(value = "properly_set", collectionType = HashMap.class)
     public Map<String, Boolean> properly_set = new HashMap<>();
     @Persist(value = "duration", collectionType = HashMap.class)
@@ -93,6 +93,10 @@ public String toggleTrigger(String triggerName, boolean toggle) {
         }
     }
 
+    public boolean triggerNameIsValid(String triggerName) {
+        return enabled.containsKey(triggerName.toUpperCase());
+    }
+
     public String toggleTrigger(String triggerName) {
         if (enabled.containsKey(triggerName.toUpperCase())) {
             if (enabled.get(triggerName.toUpperCase())) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java
@@ -1,6 +1,7 @@
 package com.denizenscript.denizen.scripts.commands.npc;
 
 import com.denizenscript.denizen.utilities.Utilities;
+import com.denizenscript.denizencore.exceptions.InvalidArgumentsRuntimeException;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.npc.traits.TriggerTrait;
 import com.denizenscript.denizen.objects.NPCTag;
@@ -129,16 +130,16 @@ public void execute(ScriptEntry scriptEntry) {
             npc.getCitizen().addTrait(TriggerTrait.class);
         }
         TriggerTrait trait = npc.getCitizen().getOrAddTrait(TriggerTrait.class);
+        if (!trait.triggerNameIsValid(trigger.asString())) {
+            throw new InvalidArgumentsRuntimeException("Invalid trigger name '" + trigger + "' - are you sure you spelled it right?");
+        }
         switch (Toggle.valueOf(toggle.asString().toUpperCase())) {
-
             case TOGGLE:
                 trait.toggleTrigger(trigger.asString());
                 break;
-
             case TRUE:
                 trait.toggleTrigger(trigger.asString(), true);
                 break;
-
             case FALSE:
                 trait.toggleTrigger(trigger.asString(), false);
                 break;