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

- Added Nix

Browse Source
This commit is contained in:
swordshine
2014-05-31 08:48:35 +00:00
parent 76c6812355
commit d4f9badca0
7 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
View File

@@ -104,6 +104,10 @@ public class CounterEffect extends SpellAbilityEffect {
continue;
}
if (sa.hasParam("CounterNoManaSpell") && tgtSA.getTotalManaSpent() != 0) {
continue;
}
if (sa.hasParam("RememberCounteredCMC")) {
sa.getHostCard().addRemembered((Integer) tgtSACard.getCMC());
}

2
forge-game/src/main/java/forge/game/phase/Phase.java
View File

@@ -138,7 +138,7 @@ public class Phase implements java.io.Serializable {
}
}
public final void RegisterUntilEndCommand(final Player p) {
public final void registerUntilEndCommand(final Player p) {
if (this.registerMap.containsKey(p)) {
this.untilEndMap.put(p, registerMap.get(p));
registerMap.remove(p);

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

@@ -425,7 +425,7 @@ public class PhaseHandler implements java.io.Serializable {
c.getDamageHistory().setNotBeenBlockedSinceLastUpkeepOf(this.getPlayerTurn());
}
game.getUpkeep().executeUntilEndOfPhase(this.getPlayerTurn());
game.getUpkeep().RegisterUntilEndCommand(this.getPlayerTurn());
game.getUpkeep().registerUntilEndCommand(this.getPlayerTurn());
break;
case COMBAT_END: