From aa34b74fc477bbb7337dc11b64a2152cd0ba7754 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sat, 20 Nov 2021 13:02:24 +0100 Subject: [PATCH] Fix AI not playing Lord of Tresserhorn trigger --- forge-ai/src/main/java/forge/ai/ability/DrawAi.java | 2 +- .../src/main/java/forge/game/phase/PhaseHandler.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java index 48a3dcce9a0..b796bfadcdc 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java @@ -176,7 +176,7 @@ public class DrawAi extends SpellAbilityAi { @Override public boolean chkAIDrawback(SpellAbility sa, Player ai) { - return targetAI(ai, sa, false); + return targetAI(ai, sa, sa.isTrigger() && !sa.getRootAbility().isOptionalTrigger()); } /** diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java index aa976ed0cb9..a6c73345283 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -981,15 +981,15 @@ public class PhaseHandler implements java.io.Serializable { } public final boolean isFirstCombat() { - return (nCombatsThisTurn == 1); + return nCombatsThisTurn == 1; } public final boolean isFirstUpkeep() { - return is(PhaseType.UPKEEP) && (nUpkeepsThisTurn == 0); + return is(PhaseType.UPKEEP) && nUpkeepsThisTurn == 0; } public final boolean isFirstUpkeepThisGame() { - return is(PhaseType.UPKEEP) && (nUpkeepsThisGame == 0); + return is(PhaseType.UPKEEP) && nUpkeepsThisGame == 0; } public final boolean isPreCombatMain() { @@ -998,7 +998,7 @@ public class PhaseHandler implements java.io.Serializable { } public final boolean beforeFirstPostCombatMainEnd() { - return (nMain2sThisTurn == 0); + return nMain2sThisTurn == 0; } private final static boolean DEBUG_PHASES = false;