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

Merge branch 'master' into 'master'

Browse Source 
Leonin Vanguard fix + Medomai

See merge request core-developers/forge!4372
This commit is contained in:
swordshine
2021-04-04 15:33:30 +00:00
parent 05884bba0d b37d695c8b
commit b9dc9e6eb0
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,11 +257,6 @@ public class CombatUtil {
return false;
}
break;
case "CARDNAME can't attack during extra turns.":
if (game.getPhaseHandler().getPlayerTurn().isExtraTurn()) {
return false;
}
break;
}
}

4
forge-game/src/main/java/forge/game/staticability/StaticAbility.java
View File

@@ -539,6 +539,10 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
if (ph.isPlayerTurn(controller)) {
return false;
}
} else if (condition.equals("ExtraTurn")) {
if (!game.getPhaseHandler().getPlayerTurn().isExtraTurn()) {
return false;
}
} else if (condition.equals("PermanentOfEachColor")) {
if ((controller.getColoredCardsInPlay(MagicColor.Constant.BLACK).isEmpty()
|| controller.getColoredCardsInPlay(MagicColor.Constant.BLUE).isEmpty()