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

Fix ReplaceToken

Browse Source
This commit is contained in:
tool4EvEr
2022-01-20 22:53:26 +01:00
committed by TRT
parent 6f9de43e51
commit 052c82545f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/ReplaceTokenEffect.java
View File

@@ -81,6 +81,7 @@ public class ReplaceTokenEffect extends SpellAbilityEffect {
long timestamp = game.getNextTimestamp(); long timestamp = game.getNextTimestamp();
Map<Player, Integer> toInsertMap = Maps.newHashMap(); Map<Player, Integer> toInsertMap = Maps.newHashMap();
Map<Player, Iterable<Object>> toRememberMap = Maps.newHashMap();
Set<Card> toRemoveSet = Sets.newHashSet(); Set<Card> toRemoveSet = Sets.newHashSet();
for (Map.Entry<Card, Integer> e : table.row(affected).entrySet()) { for (Map.Entry<Card, Integer> e : table.row(affected).entrySet()) {
if (!sa.matchesValidParam("ValidCard", e.getKey())) { if (!sa.matchesValidParam("ValidCard", e.getKey())) {
@@ -89,6 +90,7 @@ public class ReplaceTokenEffect extends SpellAbilityEffect {
Player controller = e.getKey().getController(); Player controller = e.getKey().getController();
int old = ObjectUtils.defaultIfNull(toInsertMap.get(controller), 0); int old = ObjectUtils.defaultIfNull(toInsertMap.get(controller), 0);
toInsertMap.put(controller, old + e.getValue()); toInsertMap.put(controller, old + e.getValue());
toRememberMap.put(controller, e.getKey().getRemembered());
toRemoveSet.add(e.getKey()); toRemoveSet.add(e.getKey());
} }
// remove replaced tokens // remove replaced tokens
@@ -107,6 +109,8 @@ public class ReplaceTokenEffect extends SpellAbilityEffect {
} }
token.setController(pe.getKey(), timestamp); token.setController(pe.getKey(), timestamp);
// if token is created from ForEach keep that
token.addRemembered(toRememberMap.get(pe.getKey()));
table.put(affected, token, pe.getValue()); table.put(affected, token, pe.getValue());
} }
} }