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

MagicStack: call resetCardsAddedThisTurn on onNextTurn

Browse Source
This commit is contained in:
Hans Mackowiak
2020-05-21 10:36:03 +00:00
parent c0578fb246
commit f5e5ddbbb9
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -798,11 +798,6 @@ public class PhaseHandler implements java.io.Serializable {
// reset mustAttackEntity // reset mustAttackEntity
playerTurn.setMustAttackEntity(null); playerTurn.setMustAttackEntity(null);
for (final Player p1 : game.getPlayers()) {
for (final ZoneType z : Player.ALL_ZONES) {
p1.getZone(z).resetCardsAddedThisTurn();
}
}
for (Player p : game.getPlayers()) { for (Player p : game.getPlayers()) {
p.clearNextTurn(); p.clearNextTurn();
} }

3
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -3196,6 +3196,9 @@ public class Player extends GameEntity implements Comparable<Player> {
} }
public final void clearNextTurn() { public final void clearNextTurn() {
for (final PlayerZone pz : zones.values()) {
pz.resetCardsAddedThisTurn();
}
resetProwl(); resetProwl();
setSpellsCastLastTurn(getSpellsCastThisTurn()); setSpellsCastLastTurn(getSpellsCastThisTurn());
resetSpellsCastThisTurn(); resetSpellsCastThisTurn();

1
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -785,6 +785,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
} }
public final void onNextTurn() { public final void onNextTurn() {
game.getStackZone().resetCardsAddedThisTurn();
if (thisTurnCast.isEmpty()) { if (thisTurnCast.isEmpty()) {
lastTurnCast = Lists.newArrayList(); lastTurnCast = Lists.newArrayList();
return; return;