diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 40886f68a47..b035731f1f2 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -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));