minor cleaning

DenizenScript · Nov 9, 2021 · b3a7f36 · b3a7f36
1 parent 72046a3
commit b3a7f36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/main/java/com/denizenscript/ddiscordbot/DiscordScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/DiscordScriptEvent.java
@@ -15,7 +15,7 @@ public abstract class DiscordScriptEvent extends BukkitScriptEvent {
 
     @Override
     public boolean matches(ScriptPath path) {
-        if (!path.checkSwitch("for", botID)) {
+        if (!runGenericSwitchCheck(path, "for", botID)) {
             return false;
         }
         return super.matches(path);

diff --git a/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordReactCommand.java b/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordReactCommand.java
@@ -127,12 +127,7 @@ public void execute(ScriptEntry scriptEntry) {
         DiscordUserTag user = scriptEntry.getObjectTag("user");
         ElementTag reaction = scriptEntry.getElement("reaction");
         if (scriptEntry.dbCallShouldDebug()) {
-            Debug.report(scriptEntry, getName(), id.debug()
-                    + instruction.debug()
-                    + (channel != null ? channel.debug() : "")
-                    + (user != null ? user.debug() : "")
-                    + message.debug()
-                    + reaction.debug());
+            Debug.report(scriptEntry, getName(), id, instruction, channel, user, message, reaction);
         }
         JDA client = DenizenDiscordBot.instance.connections.get(id.asString()).client;
         if (message.channel_id == 0) {