From 8c6194da3557ba502cbae77c8f8d8c6ac607e0b5 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 2 May 2021 11:55:04 +0200 Subject: [PATCH] improve logic (Najeela) --- forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java b/forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java index a0166598ed1..7c53560db5c 100644 --- a/forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java @@ -8,6 +8,7 @@ import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.player.PlayerCollection; import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; @@ -29,6 +30,10 @@ public class UntapAllAi extends SpellAbilityAi { valid = sa.getParam("ValidCards"); } list = CardLists.getValidCards(list, valid.split(","), source.getController(), source, sa); + // don't untap if only opponent benefits + PlayerCollection goodControllers = aiPlayer.getAllies(); + goodControllers.add(aiPlayer); + list = CardLists.filter(list, CardPredicates.isControlledByAnyOf(goodControllers)); return !list.isEmpty(); } return false;