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

RepeatPlayers - Swap out other remembered while resolving

Browse Source
This commit is contained in:
Bug Hunter
2021-06-06 03:27:02 +00:00
committed by Michael Kamensky
parent 6b0a88cd95
commit 999e4f81ee
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
View File

@@ -3,6 +3,7 @@ package forge.game.ability.effects;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.GameCommand; import forge.GameCommand;
@@ -154,20 +155,27 @@ public class RepeatEachEffect extends SpellAbilityEffect {
game.getUntap().addUntil(p, new GameCommand() { game.getUntap().addUntil(p, new GameCommand() {
@Override @Override
public void run() { public void run() {
List<Object> tempRemembered = Lists.newArrayList(Iterables.filter(source.getRemembered(), Player.class));
source.removeRemembered(tempRemembered);
source.addRemembered(p); source.addRemembered(p);
AbilityUtils.resolve(repeat); AbilityUtils.resolve(repeat);
source.removeRemembered(p); source.removeRemembered(p);
source.addRemembered(tempRemembered);
} }
}); });
} else { } else {
// to avoid risk of collision with other abilities swap out other Remembered Player while resolving
List<Object> tempRemembered = Lists.newArrayList(Iterables.filter(source.getRemembered(), Player.class));
source.removeRemembered(tempRemembered);
source.addRemembered(p); source.addRemembered(p);
AbilityUtils.resolve(repeat); AbilityUtils.resolve(repeat);
source.removeRemembered(p); source.removeRemembered(p);
source.addRemembered(tempRemembered);
} }
} }
} }
if(sa.hasParam("DamageMap")) { if (sa.hasParam("DamageMap")) {
game.getAction().dealDamage(false, sa.getDamageMap(), sa.getPreventMap(), sa.getCounterTable(), sa); game.getAction().dealDamage(false, sa.getDamageMap(), sa.getPreventMap(), sa.getCounterTable(), sa);
} }
if (sa.hasParam("ChangeZoneTable")) { if (sa.hasParam("ChangeZoneTable")) {