diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
index 6c0617eb00e..6b27441b38a 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -277,7 +277,6 @@ public abstract class Trigger extends TriggerReplacementBase {
      * @return a boolean.
      */
     public final boolean requirementsCheck(Game game) {
-
         if (hasParam("APlayerHasMoreLifeThanEachOther")) {
             int highestLife = Integer.MIN_VALUE; // Negative base just in case a few Lich's or Platinum Angels are running around
             final List<Player> healthiest = new ArrayList<>();
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
index 1fff67fe52d..960dac7d775 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
@@ -171,11 +171,6 @@ public class TriggerChangesZone extends Trigger {
             }
         }
 
-        /* this trigger can only be activated once per turn, verify it hasn't already run */
-        if (hasParam("ActivationLimit")) {
-            return this.getActivationsThisTurn() < Integer.parseInt(getParam("ActivationLimit"));
-        }
-
         return true;
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 8b972676c83..15395cadfb3 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -410,6 +410,13 @@ public class TriggerHandler {
             return false; // Not the right mode.
         }
 
+        /* this trigger can only be activated once per turn, verify it hasn't already run */
+        if (regtrig.hasParam("ActivationLimit")) {
+            if (regtrig.getActivationsThisTurn() >= Integer.parseInt(regtrig.getParam("ActivationLimit"))) {
+                return false;
+            }
+        }
+
         if (!regtrig.requirementsCheck(game)) {
             return false; // Conditions aren't right.
         }
diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_warmaster.txt b/forge-gui/res/cardsfolder/upcoming/elvish_warmaster.txt
new file mode 100644
index 00000000000..ac39b0ad62e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/elvish_warmaster.txt
@@ -0,0 +1,10 @@
+Name:Elvish Warmaster
+ManaCost:1 G
+Types:Creature Elf Warrior
+PT:2/2
+T:Mode$ ChangesZoneAll | ValidCards$ Elf.Other+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more other Elves enter the battlefield under your control, create a 1/1 green Elf Warrior creature token. This ability triggers only once each turn.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 |TokenScript$ g_1_1_elf_warrior | TokenOwner$ You
+A:AB$ PumpAll | Cost$ 5 G G | ValidCards$ Elf.YouCtrl | KW$ Deathtouch | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Elves you control get +2/+2 and gain deathtouch until end of turn.
+DeckHints:Type$Elf
+DeckHas:Ability$Token
+Oracle:Whenever one or more other Elves enter the battlefield under your control, create a 1/1 green Elf Warrior creature token. This ability triggers only once each turn.\n{5}{G}{G}: Elves you control get +2/+2 and gain deathtouch until end of turn.