external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete Game fields

Browse Source
This commit is contained in:
tool4EvEr
2022-05-21 09:45:48 +02:00
parent 876e2749b9
commit 09f2ecba27
4 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-game/src/main/java/forge/game/Game.java
View File

@@ -117,9 +117,6 @@ public class Game {
private CardCollection lastStateBattlefield = new CardCollection(); private CardCollection lastStateBattlefield = new CardCollection();
private CardCollection lastStateGraveyard = 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 Table<CounterType, Player, List<Pair<Card, Integer>>> countersAddedThisTurn = HashBasedTable.create();
private Map<Player, Card> topLibsCast = Maps.newHashMap(); private Map<Player, Card> topLibsCast = Maps.newHashMap();
@@ -176,28 +173,6 @@ public class Game {
this.monarchBeginTurn = monarchBeginTurn; 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() { public CardCollectionView getLastStateBattlefield() {
return lastStateBattlefield; return lastStateBattlefield;
} }
@@ -1093,8 +1068,6 @@ public class Game {
public void onCleanupPhase() { public void onCleanupPhase() {
clearCounterAddedThisTurn(); 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 // some cards need this info updated even after a player lost, so don't skip them
for (Player player : getRegisteredPlayers()) { for (Player player : getRegisteredPlayers()) {
player.onCleanupPhase(); player.onCleanupPhase();

2
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -3455,7 +3455,7 @@ public class AbilityUtils {
} }
if (value.equals("OpponentsAttackedThisTurn")) { 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); return doXMath(opps == null ? 0 : opps.size(), m, source, ctb);
} }

2
forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
View File

@@ -54,8 +54,6 @@ public class RestartGameEffect extends SpellAbilityEffect {
game.getStack().reset(); game.getStack().reset();
game.clearCounterAddedThisTurn(); game.clearCounterAddedThisTurn();
game.resetPlayersAttackedOnNextTurn();
game.resetPlayersAttackedOnNextTurn();
game.setMonarch(null); game.setMonarch(null);
game.setDayTime(null); game.setDayTime(null);
GameAction action = game.getAction(); GameAction action = game.getAction();

8
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -321,14 +321,6 @@ public class PhaseHandler implements java.io.Serializable {
declareAttackersTurnBasedAction(); declareAttackersTurnBasedAction();
game.getStack().unfreezeStack(); 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(); givePriorityToPlayer = inCombat();
break; break;