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

Fix AI not playing Lord of Tresserhorn trigger

Browse Source
This commit is contained in:
tool4EvEr
2021-11-20 13:02:24 +01:00
parent d8cceefe39
commit aa34b74fc4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/DrawAi.java
View File

@@ -176,7 +176,7 @@ public class DrawAi extends SpellAbilityAi {
@Override @Override
public boolean chkAIDrawback(SpellAbility sa, Player ai) { public boolean chkAIDrawback(SpellAbility sa, Player ai) {
return targetAI(ai, sa, false); return targetAI(ai, sa, sa.isTrigger() && !sa.getRootAbility().isOptionalTrigger());
} }
/** /**

8
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -981,15 +981,15 @@ public class PhaseHandler implements java.io.Serializable {
} }
public final boolean isFirstCombat() { public final boolean isFirstCombat() {
return (nCombatsThisTurn == 1); return nCombatsThisTurn == 1;
} }
public final boolean isFirstUpkeep() { public final boolean isFirstUpkeep() {
return is(PhaseType.UPKEEP) && (nUpkeepsThisTurn == 0); return is(PhaseType.UPKEEP) && nUpkeepsThisTurn == 0;
} }
public final boolean isFirstUpkeepThisGame() { public final boolean isFirstUpkeepThisGame() {
return is(PhaseType.UPKEEP) && (nUpkeepsThisGame == 0); return is(PhaseType.UPKEEP) && nUpkeepsThisGame == 0;
} }
public final boolean isPreCombatMain() { public final boolean isPreCombatMain() {
@@ -998,7 +998,7 @@ public class PhaseHandler implements java.io.Serializable {
} }
public final boolean beforeFirstPostCombatMainEnd() { public final boolean beforeFirstPostCombatMainEnd() {
return (nMain2sThisTurn == 0); return nMain2sThisTurn == 0;
} }
private final static boolean DEBUG_PHASES = false; private final static boolean DEBUG_PHASES = false;