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

Subtlety fix (#9005)

Browse Source
This commit is contained in:
tool4ever
2025-10-26 22:52:53 +01:00
committed by GitHub
parent 136940a16c
commit a6e8ac5ccf
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -475,11 +475,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
origin.addAll(ZoneType.listValueOf(sa.getParam("Origin"))); origin.addAll(ZoneType.listValueOf(sa.getParam("Origin")));
} }
int libraryPosition = sa.hasParam("LibraryPosition") ? AbilityUtils.calculateAmount(hostCard, sa.getParam("LibraryPosition"), sa) : 0; int libPos = sa.hasParam("LibraryPosition") ? AbilityUtils.calculateAmount(hostCard, sa.getParam("LibraryPosition"), sa) : 0;
if (sa.hasParam("DestinationAlternative")) { if (sa.hasParam("DestinationAlternative")) {
Pair<ZoneType, Integer> pair = handleAltDest(sa, hostCard, destination, libraryPosition, activator); Pair<ZoneType, Integer> pair = handleAltDest(sa, hostCard, destination, libPos, activator);
destination = pair.getKey(); destination = pair.getKey();
libraryPosition = pair.getValue(); libPos = pair.getValue();
} }
final GameEntityCounterTable counterTable = new GameEntityCounterTable(); final GameEntityCounterTable counterTable = new GameEntityCounterTable();
@@ -497,7 +497,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
continue; continue;
} }
removeFromStack(tgtSA, sa, si, game, triggerList, counterTable); removeFromStack(tgtSA, sa, si, destination, libPos, game, triggerList, counterTable);
} // End of change from stack } // End of change from stack
final String remember = sa.getParam("RememberChanged"); final String remember = sa.getParam("RememberChanged");
@@ -729,7 +729,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
handleExiledWith(gameCard, sa); handleExiledWith(gameCard, sa);
} }
movedCard = game.getAction().moveTo(destination, gameCard, libraryPosition, sa, moveParams); movedCard = game.getAction().moveTo(destination, gameCard, libPos, sa, moveParams);
if (destination.equals(ZoneType.Exile) && lastStateBattlefield.contains(gameCard) && hostCard.equals(gameCard)) { if (destination.equals(ZoneType.Exile) && lastStateBattlefield.contains(gameCard) && hostCard.equals(gameCard)) {
// support Parallax Wave returning itself // support Parallax Wave returning itself
@@ -1582,16 +1582,17 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
* object. * object.
* @param game * @param game
*/ */
private void removeFromStack(final SpellAbility tgtSA, final SpellAbility srcSA, final SpellAbilityStackInstance si, final Game game, CardZoneTable triggerList, GameEntityCounterTable counterTable) { private void removeFromStack(final SpellAbility tgtSA, final SpellAbility srcSA, final SpellAbilityStackInstance si, final ZoneType destination, final int libPos,
final Game game, CardZoneTable triggerList, GameEntityCounterTable counterTable) {
final Card tgtHost = tgtSA.getHostCard(); final Card tgtHost = tgtSA.getHostCard();
game.getStack().remove(si); game.getStack().remove(si);
Map<AbilityKey,Object> params = AbilityKey.newMap(); if (destination != null) {
params.put(AbilityKey.StackSa, tgtSA); Map<AbilityKey,Object> params = AbilityKey.newMap();
AbilityKey.addCardZoneTableParams(params, triggerList); params.put(AbilityKey.StackSa, tgtSA);
AbilityKey.addCardZoneTableParams(params, triggerList);
Card movedCard = null; Card movedCard = null;
if (srcSA.hasParam("Destination")) {
final boolean remember = srcSA.hasParam("RememberChanged"); final boolean remember = srcSA.hasParam("RememberChanged");
final boolean imprint = srcSA.hasParam("Imprint"); final boolean imprint = srcSA.hasParam("Imprint");
if (tgtSA.isAbility()) { if (tgtSA.isAbility()) {
@@ -1604,15 +1605,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
movedCard = game.getAction().exile(tgtHost, srcSA, params); movedCard = game.getAction().exile(tgtHost, srcSA, params);
handleExiledWith(movedCard, srcSA); handleExiledWith(movedCard, srcSA);
} else if (srcSA.getParam("Destination").equals("TopOfLibrary")) {
movedCard = game.getAction().moveToLibrary(tgtHost, srcSA, params);
} else if (srcSA.getParam("Destination").equals("Hand")) { } else if (srcSA.getParam("Destination").equals("Hand")) {
movedCard = game.getAction().moveToHand(tgtHost, srcSA, params); movedCard = game.getAction().moveToHand(tgtHost, srcSA, params);
} else if (srcSA.getParam("Destination").equals("BottomOfLibrary")) {
movedCard = game.getAction().moveToBottomOfLibrary(tgtHost, srcSA, params);
} else if (srcSA.getParam("Destination").equals("Library")) { } else if (srcSA.getParam("Destination").equals("Library")) {
final int libraryPos = srcSA.hasParam("LibraryPosition") ? AbilityUtils.calculateAmount(tgtHost, srcSA.getParam("LibraryPosition"), srcSA) : 0; movedCard = game.getAction().moveToLibrary(tgtHost, libPos, srcSA, params);
movedCard = game.getAction().moveToLibrary(tgtHost, libraryPos, srcSA, params);
if (srcSA.hasParam("Shuffle") && "True".equals(srcSA.getParam("Shuffle"))) { if (srcSA.hasParam("Shuffle") && "True".equals(srcSA.getParam("Shuffle"))) {
tgtHost.getOwner().shuffle(srcSA); tgtHost.getOwner().shuffle(srcSA);
} }