From c581531cfff0b7b6f0c8c37b1c352e39c97b630d Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Thu, 6 Jul 2017 08:45:07 +0000
Subject: [PATCH] GameAction: fix ETB counters with Solemnity

---
 forge-game/src/main/java/forge/game/GameAction.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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));