From 17b5098602f0ecf18a3e5c7c9da2a74f91a1064a Mon Sep 17 00:00:00 2001 From: Adam Pantel <> Date: Sat, 17 Apr 2021 11:14:50 -0400 Subject: [PATCH] Costs should trigger Ranar/Laelia --- forge-game/src/main/java/forge/game/cost/CostAdjustment.java | 2 +- forge-game/src/main/java/forge/game/cost/CostMill.java | 2 +- forge-game/src/main/java/forge/game/cost/CostPartWithList.java | 2 +- forge-gui/src/main/java/forge/player/HumanPlay.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java index 7379fc7de5e..df2985274e8 100644 --- a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java +++ b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java @@ -237,7 +237,7 @@ public class CostAdjustment { table.put(ZoneType.Graveyard, d.getZone().getZoneType(), d); } } - table.triggerChangesZoneAll(game, null); + table.triggerChangesZoneAll(game, sa); } if (sa.getHostCard().hasKeyword(Keyword.CONVOKE)) { adjustCostByConvokeOrImprovise(cost, sa, false, test); diff --git a/forge-game/src/main/java/forge/game/cost/CostMill.java b/forge-game/src/main/java/forge/game/cost/CostMill.java index 8be0bf12f4d..296bbc3e1f8 100644 --- a/forge-game/src/main/java/forge/game/cost/CostMill.java +++ b/forge-game/src/main/java/forge/game/cost/CostMill.java @@ -101,7 +101,7 @@ public class CostMill extends CostPart { public final boolean payAsDecided(final Player ai, final PaymentDecision decision, SpellAbility ability) { CardZoneTable table = new CardZoneTable(); ability.getPaidHash().put("Milled", (CardCollection) ai.mill(decision.c, ZoneType.Graveyard, false, ability, table)); - table.triggerChangesZoneAll(ai.getGame(), null); + table.triggerChangesZoneAll(ai.getGame(), ability); return true; } diff --git a/forge-game/src/main/java/forge/game/cost/CostPartWithList.java b/forge-game/src/main/java/forge/game/cost/CostPartWithList.java index 6cf195e33de..8478ec38838 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPartWithList.java +++ b/forge-game/src/main/java/forge/game/cost/CostPartWithList.java @@ -175,7 +175,7 @@ public abstract class CostPartWithList extends CostPart { // copy table because the original get cleaned after the cost is done final CardZoneTable copyTable = new CardZoneTable(); copyTable.putAll(table); - copyTable.triggerChangesZoneAll(payer.getGame(), null); + copyTable.triggerChangesZoneAll(payer.getGame(), ability); } } diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index 6eb99a2d807..8a76b21a2f3 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -698,7 +698,7 @@ public class HumanPlay { ability.clearTappedForConvoke(); } if (!table.isEmpty() && !manaInputCancelled) { - table.triggerChangesZoneAll(game, null); + table.triggerChangesZoneAll(game, ability); } return !manaInputCancelled; }