From 09f2ecba27781f97c3ca98b0245e2b8b0238f0bc Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sat, 21 May 2022 09:45:48 +0200
Subject: [PATCH] Remove obsolete Game fields

---
 forge-game/src/main/java/forge/game/Game.java | 27 -------------------
 .../java/forge/game/ability/AbilityUtils.java |  2 +-
 .../ability/effects/RestartGameEffect.java    |  2 --
 .../java/forge/game/phase/PhaseHandler.java   |  8 ------
 4 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
index b9dfdf49c74..81d6bc5600f 100644
--- a/forge-game/src/main/java/forge/game/Game.java
+++ b/forge-game/src/main/java/forge/game/Game.java
@@ -117,9 +117,6 @@ public class Game {
     private CardCollection lastStateBattlefield = new CardCollection();
     private CardCollection lastStateGraveyard = new CardCollection();
 
-    private Map<Player, PlayerCollection> attackedThisTurn = Maps.newHashMap();
-    private Map<Player, PlayerCollection> attackedLastTurn = Maps.newHashMap();
-
     private Table<CounterType, Player, List<Pair<Card, Integer>>> countersAddedThisTurn = HashBasedTable.create();
 
     private Map<Player, Card> topLibsCast = Maps.newHashMap();
@@ -176,28 +173,6 @@ public class Game {
         this.monarchBeginTurn = monarchBeginTurn;
     }
 
-    public Map<Player, PlayerCollection> getPlayersAttackedThisTurn() {
-        return attackedThisTurn;
-    }
-
-    public Map<Player, PlayerCollection> getPlayersAttackedLastTurn() {
-        return attackedLastTurn;
-    }
-
-    public void addPlayerAttackedThisTurn(Player attacker, Player defender) {
-        PlayerCollection atk = attackedThisTurn.get(attacker);
-        if (atk == null) {
-            attackedThisTurn.put(attacker, new PlayerCollection());
-        }
-        attackedThisTurn.get(attacker).add(defender);
-    }
-
-    public void resetPlayersAttackedOnNextTurn() {
-        attackedLastTurn.clear();
-        attackedLastTurn.putAll(attackedThisTurn);
-        attackedThisTurn.clear();
-    }
-
     public CardCollectionView getLastStateBattlefield() {
         return lastStateBattlefield;
     }
@@ -1093,8 +1068,6 @@ public class Game {
 
     public void onCleanupPhase() {
         clearCounterAddedThisTurn();
-        // Reset the attackers this turn/last turn
-        resetPlayersAttackedOnNextTurn();
         // some cards need this info updated even after a player lost, so don't skip them
         for (Player player : getRegisteredPlayers()) {
             player.onCleanupPhase();
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index 9faebda5453..5439518582a 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -3455,7 +3455,7 @@ public class AbilityUtils {
         }
 
         if (value.equals("OpponentsAttackedThisTurn")) {
-            final PlayerCollection opps = game.getPlayersAttackedThisTurn().get(player);
+            final List<Player> opps = player.getAttackedPlayersMyTurn();
             return doXMath(opps == null ? 0 : opps.size(), m, source, ctb);
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
index f2361496188..6b81775dd39 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
@@ -54,8 +54,6 @@ public class RestartGameEffect extends SpellAbilityEffect {
 
         game.getStack().reset();
         game.clearCounterAddedThisTurn();
-        game.resetPlayersAttackedOnNextTurn();
-        game.resetPlayersAttackedOnNextTurn();
         game.setMonarch(null);
         game.setDayTime(null);
         GameAction action = game.getAction();
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 885646b5b37..88310daba2b 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -321,14 +321,6 @@ public class PhaseHandler implements java.io.Serializable {
                     declareAttackersTurnBasedAction();
                     game.getStack().unfreezeStack();
 
-                    if (combat != null) {
-                        for (Card c : combat.getAttackers()) {
-                            if (combat.getDefenderByAttacker(c) instanceof Player) {
-                                game.addPlayerAttackedThisTurn(c.getController(), (Player)combat.getDefenderByAttacker(c));
-                            }
-                        }
-                    }
-
                     givePriorityToPlayer = inCombat();
                     break;