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

Update PlaneswalkEffect.java (#4315)

Browse Source 
Fixes an issue where planeswalk replacements were being applied before confirmation for optional planeswalks, thus making it so that one couldn't choose not to planeswalk with TARDIS's attack trigger if one also controls Susan Foreman
This commit is contained in:
Klisz
2023-12-06 23:58:16 -07:00
committed by GitHub
parent 88990491a4
commit 4dbe4f1599
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,11 @@ public class PlaneswalkEffect extends SpellAbilityEffect {
return; return;
} }
if (sa.hasParam("Optional") && !sa.getActivatingPlayer().getController().confirmAction(sa, null,
Localizer.getInstance().getMessage("lblWouldYouLikeToPlaneswalk"), null)) {
return;
}
final Map<AbilityKey, Object> repParams = AbilityKey.mapFromAffected(activator); final Map<AbilityKey, Object> repParams = AbilityKey.mapFromAffected(activator);
Object cause = sa.hasParam("Cause") ? sa.getParam("Cause") : sa; Object cause = sa.hasParam("Cause") ? sa.getParam("Cause") : sa;
repParams.put(AbilityKey.Cause, cause); repParams.put(AbilityKey.Cause, cause);
@@ -31,11 +36,6 @@ public class PlaneswalkEffect extends SpellAbilityEffect {
return; return;
} }
if (sa.hasParam("Optional") && !sa.getActivatingPlayer().getController().confirmAction(sa, null,
Localizer.getInstance().getMessage("lblWouldYouLikeToPlaneswalk"), null)) {
return;
}
if (!sa.hasParam("DontPlaneswalkAway")) { if (!sa.hasParam("DontPlaneswalkAway")) {
for (Player p : game.getPlayers()) { for (Player p : game.getPlayers()) {
p.leaveCurrentPlane(); p.leaveCurrentPlane();