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

Slight tweak so it only uses old zone when LKI applies

Browse Source
This commit is contained in:
tool4EvEr
2023-02-01 12:26:02 +01:00
parent a6374d12a8
commit 0d517b37ab
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
View File

@@ -174,10 +174,11 @@ public class ReplacementHandler {
@Override @Override
public boolean visit(Card crd) { public boolean visit(Card crd) {
Card c = preList.get(crd); Card c = preList.get(crd);
Zone cardZone = game.getChangeZoneLKIInfo(c).getLastKnownZone(); Zone cardZone = game.getZoneOf(c);
Zone lkiZone = game.getChangeZoneLKIInfo(c).getLastKnownZone();
// only when not prelist // only when not prelist
if (c == crd && cardZone.is(ZoneType.Battlefield) && event == ReplacementType.Moved && if (c == crd && lkiZone.is(ZoneType.Battlefield) && event == ReplacementType.Moved &&
runParams.containsKey(AbilityKey.LastStateBattlefield) && runParams.get(AbilityKey.LastStateBattlefield) != null) { runParams.containsKey(AbilityKey.LastStateBattlefield) && runParams.get(AbilityKey.LastStateBattlefield) != null) {
Card lastState = ((CardCollectionView) runParams.get(AbilityKey.LastStateBattlefield)).get(crd); Card lastState = ((CardCollectionView) runParams.get(AbilityKey.LastStateBattlefield)).get(crd);
// no LKI found for this card so it shouldn't apply, this can happen during simultaneous zone changes // no LKI found for this card so it shouldn't apply, this can happen during simultaneous zone changes
@@ -186,6 +187,7 @@ public class ReplacementHandler {
} }
// use the LKI because it has the right RE from the state before the effect started // use the LKI because it has the right RE from the state before the effect started
c = lastState; c = lastState;
cardZone = lkiZone;
} }
for (final ReplacementEffect replacementEffect : c.getReplacementEffects()) { for (final ReplacementEffect replacementEffect : c.getReplacementEffects()) {