From d5b578b306b1fdd21f6421c68dd7c9e24f3ac385 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 6 Mar 2020 07:29:37 +0100 Subject: [PATCH] Card: move reseting xmana paid to clearTemporaryVars --- forge-game/src/main/java/forge/game/GameAction.java | 5 ----- forge-game/src/main/java/forge/game/card/Card.java | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 1d35903e7a1..16ec6662f0d 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -557,11 +557,6 @@ public class GameAction { } else if (!(zoneTo.is(ZoneType.Battlefield) && zoneFrom.is(ZoneType.Stack))) { c.setCastFrom(null); c.setCastSA(null); - - // TODO check why these are not reset - c.setXManaCostPaid(0); - c.setSunburstValue(0); - c.setXManaCostPaidByColor(null); } if (c.isAura() && zoneTo.is(ZoneType.Battlefield) && ((zoneFrom == null) || !zoneFrom.is(ZoneType.Stack)) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 0be3279d3e4..ee8179ba4a5 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -6353,6 +6353,8 @@ public class Card extends GameEntity implements Comparable { removeSVar("PayX"); // Temporary AI X announcement variable removeSVar("IsCastFromPlayEffect"); // Temporary SVar indicating that the spell is cast indirectly via AF Play setSunburstValue(0); // Sunburst + setXManaCostPaid(0); + setXManaCostPaidByColor(null); } public final int getFinalChapterNr() {