mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
MagicStack: call resetCardsAddedThisTurn on onNextTurn
This commit is contained in:
@@ -798,11 +798,6 @@ public class PhaseHandler implements java.io.Serializable {
|
||||
// reset mustAttackEntity
|
||||
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()) {
|
||||
p.clearNextTurn();
|
||||
}
|
||||
|
||||
@@ -3196,6 +3196,9 @@ public class Player extends GameEntity implements Comparable<Player> {
|
||||
}
|
||||
|
||||
public final void clearNextTurn() {
|
||||
for (final PlayerZone pz : zones.values()) {
|
||||
pz.resetCardsAddedThisTurn();
|
||||
}
|
||||
resetProwl();
|
||||
setSpellsCastLastTurn(getSpellsCastThisTurn());
|
||||
resetSpellsCastThisTurn();
|
||||
|
||||
@@ -785,6 +785,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
|
||||
}
|
||||
|
||||
public final void onNextTurn() {
|
||||
game.getStackZone().resetCardsAddedThisTurn();
|
||||
if (thisTurnCast.isEmpty()) {
|
||||
lastTurnCast = Lists.newArrayList();
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user