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

GameAction: fix ETB counters with Solemnity

Browse Source
This commit is contained in:
Hanmac
2017-07-06 08:45:07 +00:00
parent a8d4897f33
commit c581531cff
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -288,11 +288,6 @@ public class GameAction {
lastKnownInfo = CardUtil.getLKICopy(c);
c.setUnearthed(false);
}
if (toBattlefield) {
copied.putEtbCounters();
}
copied.clearEtbCounters();
}
copied.getOwner().removeInboundToken(copied);
@@ -355,6 +350,14 @@ public class GameAction {
game.getTriggerHandler().clearInstrinsicActiveTriggers(c, zoneFrom);
game.getTriggerHandler().registerActiveTrigger(c, false);
// do ETB counters after StaticAbilities check
if (!suppress) {
if (toBattlefield) {
copied.putEtbCounters();
}
copied.clearEtbCounters();
}
// play the change zone sound
game.fireEvent(new GameEventCardChangeZone(c, zoneFrom, zoneTo));