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

Timing fix

Browse Source
This commit is contained in:
tool4EvEr
2022-05-19 12:39:46 +02:00
parent 969f8d2b17
commit f1a38d35bf
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,6 +431,7 @@ public class PhaseHandler implements java.io.Serializable {
}
nUpkeepsThisTurn = 0;
nCombatsThisTurn = 0;
nMain2sThisTurn = 0;
game.getStack().resetMaxDistinctSources();
@@ -479,10 +480,6 @@ public class PhaseHandler implements java.io.Serializable {
}
switch (phase) {
case UNTAP:
nCombatsThisTurn = 0;
break;
case UPKEEP:
for (Card c : game.getCardsIncludePhasingIn(ZoneType.Battlefield)) {
c.getDamageHistory().setNotAttackedSinceLastUpkeepOf(playerTurn);

2
forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
View File

@@ -330,7 +330,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
}
if (this.getFirstCombatOnly()) {
if (game.getPhaseHandler().getNumCombat() > 1) {
if (game.getPhaseHandler().getNumCombat() > (game.getPhaseHandler().inCombat() ? 1 : 0)) {
return false;
}
}