From 46670d50f3cf03fbd9c4fba0e37a7c7bb0f778a0 Mon Sep 17 00:00:00 2001 From: Chris H Date: Fri, 22 Feb 2019 04:09:19 +0000 Subject: [PATCH] Make sure Token AI loads TokenScript params before doing things with hte token (cherry picked from commit 7d6a26184b4f852442730237826c94a16d739e5b) --- forge-ai/src/main/java/forge/ai/ability/TokenAi.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java index 56d88681c72..7b2a02ebf11 100644 --- a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java @@ -9,7 +9,10 @@ import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; import forge.game.ability.effects.TokenEffect; -import forge.game.card.*; +import forge.game.card.Card; +import forge.game.card.CardCollection; +import forge.game.card.CardLists; +import forge.game.card.CardPredicates; import forge.game.card.token.TokenInfo; import forge.game.combat.Combat; import forge.game.cost.CostPart; @@ -340,6 +343,7 @@ public class TokenAi extends SpellAbilityAi { @Override protected Player chooseSinglePlayer(Player ai, SpellAbility sa, Iterable options) { // TODO: AILogic + readParameters(sa); // remember to call this somewhere! Combat combat = ai.getGame().getCombat(); // TokenAttacking if (combat != null && sa.hasParam("TokenAttacking")) { @@ -359,6 +363,7 @@ public class TokenAi extends SpellAbilityAi { @Override protected GameEntity chooseSinglePlayerOrPlaneswalker(Player ai, SpellAbility sa, Iterable options) { // TODO: AILogic + readParameters(sa); // remember to call this somewhere! Combat combat = ai.getGame().getCombat(); // TokenAttacking if (combat != null && sa.hasParam("TokenAttacking")) {