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

Costs should trigger Ranar/Laelia

Browse Source
This commit is contained in:
Adam Pantel
2021-04-17 11:14:50 -04:00
committed by Michael Kamensky
parent 272a7afe9e
commit 17b5098602
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/cost/CostAdjustment.java
View File

@@ -237,7 +237,7 @@ public class CostAdjustment {
table.put(ZoneType.Graveyard, d.getZone().getZoneType(), d); table.put(ZoneType.Graveyard, d.getZone().getZoneType(), d);
} }
} }
table.triggerChangesZoneAll(game, null); table.triggerChangesZoneAll(game, sa);
} }
if (sa.getHostCard().hasKeyword(Keyword.CONVOKE)) { if (sa.getHostCard().hasKeyword(Keyword.CONVOKE)) {
adjustCostByConvokeOrImprovise(cost, sa, false, test); adjustCostByConvokeOrImprovise(cost, sa, false, test);

2
forge-game/src/main/java/forge/game/cost/CostMill.java
View File

@@ -101,7 +101,7 @@ public class CostMill extends CostPart {
public final boolean payAsDecided(final Player ai, final PaymentDecision decision, SpellAbility ability) { public final boolean payAsDecided(final Player ai, final PaymentDecision decision, SpellAbility ability) {
CardZoneTable table = new CardZoneTable(); CardZoneTable table = new CardZoneTable();
ability.getPaidHash().put("Milled", (CardCollection) ai.mill(decision.c, ZoneType.Graveyard, false, ability, table)); 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; return true;
} }

2
forge-game/src/main/java/forge/game/cost/CostPartWithList.java
View File

@@ -175,7 +175,7 @@ public abstract class CostPartWithList extends CostPart {
// copy table because the original get cleaned after the cost is done // copy table because the original get cleaned after the cost is done
final CardZoneTable copyTable = new CardZoneTable(); final CardZoneTable copyTable = new CardZoneTable();
copyTable.putAll(table); copyTable.putAll(table);
copyTable.triggerChangesZoneAll(payer.getGame(), null); copyTable.triggerChangesZoneAll(payer.getGame(), ability);
} }
} }

2
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -698,7 +698,7 @@ public class HumanPlay {
ability.clearTappedForConvoke(); ability.clearTappedForConvoke();
} }
if (!table.isEmpty() && !manaInputCancelled) { if (!table.isEmpty() && !manaInputCancelled) {
table.triggerChangesZoneAll(game, null); table.triggerChangesZoneAll(game, ability);
} }
return !manaInputCancelled; return !manaInputCancelled;
} }