merge fix

magefree · Jan 7, 2025 · 0c8d49c · 0c8d49c
1 parent 5626c5f
commit 0c8d49c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Mage.Common/src/main/java/mage/utils/SystemUtil.java b/Mage.Common/src/main/java/mage/utils/SystemUtil.java
@@ -554,10 +554,11 @@ public static void executeCheatCommands(Game game, String commandsFilePath, Play
 
                     case COMMAND_OPPONENT_UNDER_CONTROL_START: {
                         Target target = new TargetPlayer().withNotTarget(true).withChooseHint("to take under your control");
-                        if (feedbackPlayer.chooseTarget(Outcome.GainControl, target, fakeSourceAbilityTemplate, game)) {
+                        Ability fakeSourceAbility = fakeSourceAbilityTemplate.copy();
+                        if (feedbackPlayer.chooseTarget(Outcome.GainControl, target, fakeSourceAbility, game)) {
                             Player targetPlayer = game.getPlayer(target.getFirstTarget());
                             if (targetPlayer != null && targetPlayer != feedbackPlayer) {
-                                CardUtil.takeControlUnderPlayerStart(game, fakeSourceAbilityTemplate, feedbackPlayer, targetPlayer, false);
+                                CardUtil.takeControlUnderPlayerStart(game, fakeSourceAbility, feedbackPlayer, targetPlayer, false);
                                 // allow priority play again in same step (for better cheat UX)
                                 targetPlayer.resetPassed();
                             }
@@ -569,10 +570,11 @@ public static void executeCheatCommands(Game game, String commandsFilePath, Play
 
                     case COMMAND_OPPONENT_UNDER_CONTROL_END: {
                         Target target = new TargetPlayer().withNotTarget(true).withChooseHint("to free from your control");
-                        if (feedbackPlayer.chooseTarget(Outcome.GainControl, target, fakeSourceAbilityTemplate, game)) {
+                        Ability fakeSourceAbility = fakeSourceAbilityTemplate.copy();
+                        if (feedbackPlayer.chooseTarget(Outcome.GainControl, target, fakeSourceAbility, game)) {
                             Player targetPlayer = game.getPlayer(target.getFirstTarget());
                             if (targetPlayer != null && targetPlayer != feedbackPlayer && !targetPlayer.isGameUnderControl()) {
-                                CardUtil.takeControlUnderPlayerEnd(game, fakeSourceAbilityTemplate, feedbackPlayer, targetPlayer);
+                                CardUtil.takeControlUnderPlayerEnd(game, fakeSourceAbility, feedbackPlayer, targetPlayer);
                             }
                             // workaround for refresh priority dialog like avatar click (cheats called from priority in 99%)
                             game.firePriorityEvent(feedbackPlayer.getId());

diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/cheats/LoadCheatsTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/cheats/LoadCheatsTest.java
@@ -55,11 +55,11 @@ public void testCommands(){
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
 
-        setChoice(playerA, "5"); // choose [group 3]: 5 = 2 default menus + 3 group
+        setChoice(playerA, "7"); // choose [group 3]: 7 = 4 default menus + 3 group
         SystemUtil.executeCheatCommands(currentGame, commandsFile, playerA);
 
         assertHandCount(playerA, "Razorclaw Bear", 1);
         assertPermanentCount(playerA, "Mountain", 3);
-        assertHandCount(playerA, "Island", 10); // by cheats
+        assertHandCount(playerA, "Island", 10); // possible fail: changed in amount of default cheat commands
     }
 }