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 dd53f060877..58e11b6cb50 100644 --- a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java @@ -206,7 +206,8 @@ public class TokenAi extends SpellAbilityAi { && game.getPhaseHandler().getPlayerTurn().isOpponentOf(ai) && game.getCombat() != null && !game.getCombat().getAttackers().isEmpty() - && alwaysOnOppAttack) { + && alwaysOnOppAttack + && actualToken.isCreature()) { for (Card attacker : game.getCombat().getAttackers()) { if (CombatUtil.canBlock(attacker, actualToken)) { return true; diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java index a25282f0e9a..cd41f0f9630 100644 --- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java @@ -996,7 +996,7 @@ public class CombatUtil { * @return a boolean. */ public static boolean canBlock(final Card attacker, final Card blocker, final boolean nextTurn) { - if (attacker == null || blocker == null) { + if (attacker == null || blocker == null || !blocker.isCreature()) { return false; }