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

Merge branch 'master' into 'master'

Browse Source 
- Minor cleanup.

See merge request core-developers/forge!230
This commit is contained in:
Michael Kamensky
2018-02-18 08:59:38 +00:00
parent 13ace49230 b7601fded3
commit 2e70eb6718
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-ai/src/main/java/forge/ai/ability/DestroyAi.java
View File

@@ -81,13 +81,9 @@ public class DestroyAi extends SpellAbilityAi {
}
}
if (("Pactivator".equals(logic)) && (havepact)) {
if (
(!ai.getGame().getPhaseHandler().isPlayerTurn(ai)) &&
((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN))
|| (ai.getGame().getPhaseHandler().is(PhaseType.COMBAT_DECLARE_BLOCKERS)))
&&
(ai.getOpponents().get(0).getCreaturesInPlay().size() > 0)
) {
if ((!ai.getGame().getPhaseHandler().isPlayerTurn(ai))
&& ((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)) || (ai.getGame().getPhaseHandler().is(PhaseType.COMBAT_DECLARE_BLOCKERS)))
&& (ai.getOpponents().get(0).getCreaturesInPlay().size() > 0)) {
ai.getController().chooseTargetsFor(sa);
return true;
}