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

Make canBlock check if the blocker is a creature. (#7098)

Browse Source 
- TokenAi also checks if the spawned token is a creature before running checks.
This commit is contained in:
Agetian
2025-02-28 22:09:37 +03:00
committed by GitHub
parent d05523360d
commit d1751262df
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/ability/TokenAi.java
View File

@@ -206,7 +206,8 @@ public class TokenAi extends SpellAbilityAi {
&& game.getPhaseHandler().getPlayerTurn().isOpponentOf(ai) && game.getPhaseHandler().getPlayerTurn().isOpponentOf(ai)
&& game.getCombat() != null && game.getCombat() != null
&& !game.getCombat().getAttackers().isEmpty() && !game.getCombat().getAttackers().isEmpty()
&& alwaysOnOppAttack) { && alwaysOnOppAttack
&& actualToken.isCreature()) {
for (Card attacker : game.getCombat().getAttackers()) { for (Card attacker : game.getCombat().getAttackers()) {
if (CombatUtil.canBlock(attacker, actualToken)) { if (CombatUtil.canBlock(attacker, actualToken)) {
return true; return true;

2
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -996,7 +996,7 @@ public class CombatUtil {
* @return a boolean. * @return a boolean.
*/ */
public static boolean canBlock(final Card attacker, final Card blocker, final boolean nextTurn) { 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; return false;
} }