"this combat" bug (#4547)

* fixed bug in cards using 'this combat' * handle tracking when creature removed from combat early
Card-Forge · Jan 19, 2024 · 9cbecf2 · 9cbecf2
1 parent cf2c2cc
commit 9cbecf2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/forge-game/src/main/java/forge/game/card/CardDamageHistory.java b/forge-game/src/main/java/forge/game/card/CardDamageHistory.java
@@ -309,5 +309,8 @@ public void newTurn() {
 
     public void endCombat() {
         damagedThisCombat.clear();
+        setCreatureAttackedThisCombat(null, -1);
+        setCreatureBlockedThisCombat(false);
+        setCreatureGotBlockedThisCombat(false);
     }
 }
diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -31,6 +31,7 @@
 import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
 import forge.game.trigger.TriggerType;
+import forge.game.zone.ZoneType;
 import forge.util.CardTranslation;
 import forge.util.Localizer;
 import forge.util.collect.FCollection;
@@ -154,13 +155,18 @@ public void endCombat() {
         lkiCache.clear();
         combatantsThatDealtFirstStrikeDamage.clear();
 
+        //clear tracking for cards that care about "this combat"
+        Game game = playerWhoAttacks.getGame();
+        for (Card c : game.getCardsIncludePhasingIn(ZoneType.Battlefield)) {
+            c.getDamageHistory().endCombat();
+        }
+        playerWhoAttacks.clearAttackedPlayersMyCombat();
+
         //update view for all attackers and blockers
         for (Card c : attackers) {
-            c.getDamageHistory().endCombat();
             c.updateAttackingForView();
         }
         for (Card c : blockers) {
-            c.getDamageHistory().endCombat();
             c.updateBlockingForView();
         }
     }

diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -675,7 +675,6 @@ private void declareAttackersTurnBasedAction() {
             game.getTriggerHandler().runTrigger(TriggerType.AttackersDeclared, runParams, false);
         }
 
-        playerTurn.clearAttackedPlayersMyCombat();
         for (final Card c : combat.getAttackers()) {
             CombatUtil.checkDeclaredAttacker(game, c, combat, true);
         }
@@ -1275,9 +1274,6 @@ public final void setPlayerDeclaresBlockers(Player player) {
     }
 
     public void endCombat() {
-        for (Player player : game.getPlayers()) {
-            player.resetCombatantsThisCombat();
-        }
         game.getEndOfCombat().executeUntil();
         game.getEndOfCombat().executeUntilEndOfPhase(playerTurn);
         if (inCombat()) {

diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
@@ -2741,23 +2741,6 @@ public void initPlane() {
         view.updateCurrentPlaneName(currentPlanes.toString().replaceAll(" \\(.*","").replace("[",""));
     }
 
-    public final void resetCombatantsThisCombat() {
-        // resets the status of attacked/blocked this phase
-        CardCollectionView list = getCardsIn(ZoneType.Battlefield, false);
-
-        for (Card c : list) {
-            if (c.getDamageHistory().getCreatureAttackedThisCombat() > 0) {
-                c.getDamageHistory().setCreatureAttackedThisCombat(null, -1);
-            }
-            if (c.getDamageHistory().getCreatureBlockedThisCombat()) {
-                c.getDamageHistory().setCreatureBlockedThisCombat(false);
-            }
-            if (c.getDamageHistory().getCreatureGotBlockedThisCombat()) {
-                c.getDamageHistory().setCreatureGotBlockedThisCombat(false);
-            }
-        }
-    }
-
     public CardCollectionView getInboundTokens() {
         return inboundTokens;
     }