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

DigEffect: fix moveParams reused

Browse Source
This commit is contained in:
Hans Mackowiak
2024-08-10 12:03:33 +02:00
parent 64f6ebb3dd
commit 10f6d176bd
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
View File

@@ -375,10 +375,11 @@ public class DigEffect extends SpellAbilityEffect {
} }
} }
Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
AbilityKey.addCardZoneTableParams(moveParams, zoneMovements);
for (Card c : movedCards) { for (Card c : movedCards) {
Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
AbilityKey.addCardZoneTableParams(moveParams, zoneMovements);
if (destZone1.equals(ZoneType.Library) || destZone1.equals(ZoneType.PlanarDeck) || destZone1.equals(ZoneType.SchemeDeck)) { if (destZone1.equals(ZoneType.Library) || destZone1.equals(ZoneType.PlanarDeck) || destZone1.equals(ZoneType.SchemeDeck)) {
c = game.getAction().moveTo(destZone1, c, libraryPosition, sa, AbilityKey.newMap()); c = game.getAction().moveTo(destZone1, c, libraryPosition, sa, AbilityKey.newMap());
} else { } else {
@@ -470,6 +471,9 @@ public class DigEffect extends SpellAbilityEffect {
} }
for (final Card c : afterOrder) { for (final Card c : afterOrder) {
Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
AbilityKey.addCardZoneTableParams(moveParams, zoneMovements);
Card m = game.getAction().moveTo(destZone2, c, libraryPosition2, sa, moveParams); Card m = game.getAction().moveTo(destZone2, c, libraryPosition2, sa, moveParams);
if (remZone2) { if (remZone2) {
host.addRemembered(m); host.addRemembered(m);
@@ -478,6 +482,9 @@ public class DigEffect extends SpellAbilityEffect {
} else { } else {
// just move them randomly // just move them randomly
for (Card c : rest) { for (Card c : rest) {
Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
AbilityKey.addCardZoneTableParams(moveParams, zoneMovements);
if (destZone2 == ZoneType.Exile && !c.canExiledBy(sa, true)) { if (destZone2 == ZoneType.Exile && !c.canExiledBy(sa, true)) {
continue; continue;
} }