From cf03361a623b3fd3cc1ae0e61c54b49608c45d95 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Mon, 11 Jul 2022 19:13:57 +0200 Subject: [PATCH] LastState: pass through from GameAction into ReplacementHandler --- .../main/java/forge/game/replacement/ReplacementHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index 7ce788fd936..1ce46f5418e 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -44,6 +44,7 @@ import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardCollection; +import forge.game.card.CardCollectionView; import forge.game.card.CardDamageMap; import forge.game.card.CardState; import forge.game.card.CardTraitChanges; @@ -351,8 +352,8 @@ public class ReplacementHandler { tailend = tailend.getSubAbility(); } while(tailend != null); - effectSA.setLastStateBattlefield(game.getLastStateBattlefield()); - effectSA.setLastStateGraveyard(game.getLastStateGraveyard()); + effectSA.setLastStateBattlefield((CardCollectionView) runParams.getOrDefault(AbilityKey.LastStateBattlefield, game.getLastStateBattlefield())); + effectSA.setLastStateGraveyard((CardCollectionView) runParams.getOrDefault(AbilityKey.LastStateBattlefield, game.getLastStateGraveyard())); if (replacementEffect.isIntrinsic()) { effectSA.setIntrinsic(true); effectSA.changeText();