Fix merge

Card-Forge · Oct 14, 2023 · 7e62540 · 7e62540
1 parent 97e84c9
commit 7e62540
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
@@ -1523,7 +1523,7 @@ private boolean stateBasedAction_Role(Card c, CardCollection removeList) {
                 continue;
             }
             // sort by game timestamp
-            rolesByPlayer.sort(CardPredicates.compareByTimestamp());
+            rolesByPlayer.sort(CardPredicates.compareByGameTimestamp());
             removeList.addAll(rolesByPlayer.subList(0, rolesByPlayer.size() - 1));
             checkAgain = true;
         }

diff --git a/forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java
@@ -46,7 +46,7 @@ public void resolve(SpellAbility sa) {
                 card.addRemembered(tgtC);
             }
             if (sa.hasParam("TapperController")) {
-                tapper = c.getController();
+                tapper = tgtC.getController();
             }
             tgtC.tap(true, sa, tapper);
         }

diff --git a/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java
@@ -52,7 +52,7 @@ public void resolve(SpellAbility sa) {
             }
             // If the effected card is controlled by the same controller of the SA, default to untap.
             boolean tap = pc.chooseBinary(sa, Localizer.getInstance().getMessage("lblTapOrUntapTarget", CardTranslation.getTranslatedName(gameCard.getName())), PlayerController.BinaryChoiceType.TapOrUntap,
-                    !gameCard.getController().equals(sa.getActivatingPlayer()));
+                    !gameCard.getController().equals(activator));
 
             if (tap) {
                 Player tapper = activator;

diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -1190,7 +1190,6 @@ else if (prop.isEmpty() && dmgSource.equalsWithGameTimestamp(source)) {
         } else if (property.startsWith("Damaged")) {
             boolean found = false;
             for (Pair<Integer, Boolean> p : source.getDamageReceivedThisTurn()) {
-                boolean found = false;
                 if (game.getDamageLKI(p).getLeft().equalsWithGameTimestamp(card)) {
                     found = true;
                     break;

diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java
@@ -175,7 +175,7 @@ protected List<Card> addTokens(String name, int amount, Player p) {
     protected Card addToken(String name, Player p) {
         Card c = createToken(name, p);
         // card need a new Timestamp otherwise Static Abilities might collide
-        c.setTimestamp(p.getGame().getNextTimestamp());
+        c.setGameTimestamp(p.getGame().getNextTimestamp());
         p.getZone(ZoneType.Battlefield).add(c);
         return c;
     }