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

- Revert an accidental merge update.

Browse Source
This commit is contained in:
Agetian
2018-12-08 10:53:58 +03:00
parent 8f41c55543
commit 54ced3332c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-ai/src/main/java/forge/ai/ability/MillAi.java
View File

@@ -55,9 +55,11 @@ public class MillAi extends SpellAbilityAi {
} else if ("ExileAndPlayOrDealDamage".equals(sa.getParam("AILogic"))) { } else if ("ExileAndPlayOrDealDamage".equals(sa.getParam("AILogic"))) {
return (ph.is(PhaseType.MAIN1) || ph.is(PhaseType.MAIN2)) && ph.isPlayerTurn(ai); // Chandra, Torch of Defiance and similar return (ph.is(PhaseType.MAIN1) || ph.is(PhaseType.MAIN2)) && ph.isPlayerTurn(ai); // Chandra, Torch of Defiance and similar
} }
if ("You".equals(sa.getParam("Defined")) && !(!SpellAbilityAi.isSorcerySpeed(sa) && ph.is(PhaseType.END_OF_TURN) if (!sa.hasParam("Planeswalker")) { // Planeswalker abilities are only activated at sorcery speed
&& ph.getNextTurn().equals(ai)) && !sa.hasParam("Planeswalker")) { if ("You".equals(sa.getParam("Defined")) && !(!SpellAbilityAi.isSorcerySpeed(sa) && ph.is(PhaseType.END_OF_TURN)
return false; // only self-mill at opponent EOT && ph.getNextTurn().equals(ai))) {
return false; // only self-mill at opponent EOT
}
} }
if (sa.getHostCard().isCreature() && sa.getPayCosts().hasTapCost()) { if (sa.getHostCard().isCreature() && sa.getPayCosts().hasTapCost()) {
if (!(ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai))) { if (!(ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai))) {