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

MagicStack: remove getNonactivePlayers for SpellCastSinceBegOfYourLastTurn

Browse Source
This commit is contained in:
Hans Mackowiak
2025-08-29 06:57:05 +02:00
parent ea186ae4af
commit 4bf02ea61f
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2349,9 +2349,6 @@ public class Player extends GameEntity implements Comparable<Player> {
public final void resetSpellCastSinceBegOfYourLastTurn() { public final void resetSpellCastSinceBegOfYourLastTurn() {
spellsCastSinceBeginningOfLastTurn = Lists.newArrayList(); spellsCastSinceBeginningOfLastTurn = Lists.newArrayList();
} }
public final void setSpellCastSinceBegOfYourLastTurn(List<Card> spells) {
spellsCastSinceBeginningOfLastTurn = new ArrayList<>(spells);
}
public final void addSpellCastSinceBegOfYourLastTurn(List<Card> spells) { public final void addSpellCastSinceBegOfYourLastTurn(List<Card> spells) {
spellsCastSinceBeginningOfLastTurn.addAll(spells); spellsCastSinceBeginningOfLastTurn.addAll(spells);
} }

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

@@ -957,16 +957,15 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
final Player active = game.getPhaseHandler().getPlayerTurn(); final Player active = game.getPhaseHandler().getPlayerTurn();
game.getStackZone().resetCardsAddedThisTurn(); game.getStackZone().resetCardsAddedThisTurn();
this.thisTurnActivated.clear(); this.thisTurnActivated.clear();
active.resetSpellCastSinceBegOfYourLastTurn();
if (thisTurnCast.isEmpty()) { if (thisTurnCast.isEmpty()) {
lastTurnCast = Lists.newArrayList(); lastTurnCast = Lists.newArrayList();
active.resetSpellCastSinceBegOfYourLastTurn();
return; return;
} }
for (Player nonActive : game.getNonactivePlayers()) { for (Player player : game.getPlayers()) {
nonActive.addSpellCastSinceBegOfYourLastTurn(thisTurnCast); player.addSpellCastSinceBegOfYourLastTurn(thisTurnCast);
} }
lastTurnCast = Lists.newArrayList(thisTurnCast); lastTurnCast = Lists.newArrayList(thisTurnCast);
active.setSpellCastSinceBegOfYourLastTurn(thisTurnCast);
thisTurnCast.clear(); thisTurnCast.clear();
game.updateStackForView(); game.updateStackForView();
} }