fix improper object modifications

DenizenScript · Jan 3, 2023 · 4904fc8 · 4904fc8
1 parent cd9d421
commit 4904fc8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordCommandCommand.java b/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordCommandCommand.java
@@ -131,7 +131,7 @@ public static Command matchCommandByName(ScriptEntry scriptEntry, String name, J
     public static void autoExecute(ScriptEntry scriptEntry,
                                    @ArgPrefixed @ArgName("id") DiscordBotTag bot,
                                    @ArgName("instruction") DiscordCommandInstruction instruction,
-                                   @ArgPrefixed @ArgDefaultNull @ArgName("group") DiscordGroupTag group,
+                                   @ArgPrefixed @ArgDefaultNull @ArgName("group") DiscordGroupTag rawGroup,
                                    @ArgPrefixed @ArgName("name") String name,
                                    @ArgPrefixed @ArgDefaultText("slash") @ArgName("type") Command.Type type,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("description") String description,
@@ -140,9 +140,10 @@ public static void autoExecute(ScriptEntry scriptEntry,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("enabled") ElementTag enabled,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("enable_for") ListTag enableFor,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("disable_for") ListTag disableFor) {
-        if (group != null && group.bot == null) {
-            group.bot = bot.bot;
+        if (rawGroup != null && rawGroup.bot == null) {
+            rawGroup = new DiscordGroupTag(bot.bot, rawGroup.guild_id);
         }
+        final DiscordGroupTag group = rawGroup;
         if (enabled != null || enableFor != null || disableFor != null || instruction == DiscordCommandInstruction.PERMS) {
             DenizenDiscordBot.oldCommandPermissions.warn(scriptEntry);
         }

diff --git a/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordCreateChannelCommand.java b/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordCreateChannelCommand.java
@@ -75,17 +75,18 @@ public DiscordCreateChannelCommand() {
 
     public static void autoExecute(ScriptEntry scriptEntry,
                                    @ArgPrefixed @ArgName("id") DiscordBotTag bot,
-                                   @ArgPrefixed @ArgName("group") DiscordGroupTag group,
+                                   @ArgPrefixed @ArgName("group") DiscordGroupTag rawGroup,
                                    @ArgPrefixed @ArgName("name") String name,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("description") String description,
                                    @ArgPrefixed @ArgDefaultText("text") @ArgName("type") ChannelType type,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("category") String category,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("position") ElementTag position,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("roles") @ArgSubType(DiscordRoleTag.class) List<DiscordRoleTag> roles,
                                    @ArgPrefixed @ArgDefaultNull @ArgName("users") @ArgSubType(DiscordUserTag.class) List<DiscordUserTag> users) {
-        if (group != null && group.bot == null) {
-            group.bot = bot.bot;
+        if (rawGroup != null && rawGroup.bot == null) {
+            rawGroup = new DiscordGroupTag(bot.bot, rawGroup.guild_id);
         }
+        final DiscordGroupTag group = rawGroup;
         Runnable runner = () -> {
             try {
                 ChannelAction<? extends GuildChannel> action;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordChannelTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordChannelTag.java
@@ -504,7 +504,7 @@ public void adjust(Mechanism mechanism) {
             }
             DiscordUserTag user = mechanism.valueAsType(DiscordUserTag.class);
             if (user.bot == null) {
-                user.bot = bot;
+                user = new DiscordUserTag(bot, user.user_id);
             }
             ((ThreadChannel) channel).addThreadMember(user.getUser()).submit();
         }
@@ -524,7 +524,7 @@ public void adjust(Mechanism mechanism) {
             }
             DiscordUserTag user = mechanism.valueAsType(DiscordUserTag.class);
             if (user.bot == null) {
-                user.bot = bot;
+                user = new DiscordUserTag(bot, user.user_id);
             }
             ((ThreadChannel) channel).removeThreadMember(user.getUser()).submit();
         }