diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java
index 0020b71fe7..2d1a094184 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.betrayersofkamigawa;
 
-import java.util.HashSet;
-import java.util.Set;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
@@ -38,13 +36,10 @@ import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
-import mage.constants.WatcherScope;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.game.stack.Spell;
-import mage.watchers.Watcher;
+import mage.watchers.common.PlayerCastCreatureWatcher;
 
 /**
  *
@@ -110,41 +105,3 @@ class GoblinCohortEffect extends RestrictionEffect {
     }
 }
 
-class PlayerCastCreatureWatcher extends Watcher {
-
-    Set<UUID> playerIds = new HashSet<>();
-
-    public PlayerCastCreatureWatcher() {
-        super("PlayerCastCreature", WatcherScope.GAME);
-    }
-
-    public PlayerCastCreatureWatcher(final PlayerCastCreatureWatcher watcher) {
-        super(watcher);
-        this.playerIds.addAll(watcher.playerIds);
-    }
-
-    @Override
-    public void watch(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.SPELL_CAST) {
-            Spell spell = (Spell) game.getObject(event.getTargetId());
-            if (spell.getCardType().contains(CardType.CREATURE)) {
-                playerIds.add(spell.getControllerId());
-            }
-        }
-    }
-
-    @Override
-    public PlayerCastCreatureWatcher copy() {
-        return new PlayerCastCreatureWatcher(this);
-    }
-
-    @Override
-    public void reset() {
-        super.reset();
-        playerIds.clear();
-    }
-
-    public boolean playerDidCastCreatureThisTurn(UUID playerId) {
-        return playerIds.contains(playerId);
-    }
-}
diff --git a/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java b/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java
index 4163603608..1160572117 100644
--- a/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java
+++ b/Mage.Sets/src/mage/sets/tempest/MoggConscripts.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.tempest;
 
-import java.util.HashSet;
-import java.util.Set;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
@@ -38,13 +36,10 @@ import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
-import mage.constants.WatcherScope;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.game.stack.Spell;
-import mage.watchers.Watcher;
+import mage.watchers.common.PlayerCastCreatureWatcher;
 
 /**
  *
@@ -107,42 +102,3 @@ class MoggConscriptsEffect extends RestrictionEffect {
         return false;
     }
 }
-
-class PlayerCastCreatureWatcher extends Watcher {
-
-    Set<UUID> playerIds = new HashSet<>();
-
-    public PlayerCastCreatureWatcher() {
-        super("PlayerCastCreature", WatcherScope.GAME);
-    }
-
-    public PlayerCastCreatureWatcher(final PlayerCastCreatureWatcher watcher) {
-        super(watcher);
-        this.playerIds.addAll(watcher.playerIds);
-    }
-
-    @Override
-    public void watch(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.SPELL_CAST) {
-            Spell spell = (Spell) game.getObject(event.getTargetId());
-            if (spell.getCardType().contains(CardType.CREATURE)) {
-                playerIds.add(spell.getControllerId());
-            }
-        }
-    }
-
-    @Override
-    public PlayerCastCreatureWatcher copy() {
-        return new PlayerCastCreatureWatcher(this);
-    }
-
-    @Override
-    public void reset() {
-        super.reset();
-        playerIds.clear();
-    }
-
-    public boolean playerDidCastCreatureThisTurn(UUID playerId) {
-        return playerIds.contains(playerId);
-    }
-}
\ No newline at end of file
diff --git a/Mage/src/mage/watchers/common/PlayerCastCreatureWatcher.java b/Mage/src/mage/watchers/common/PlayerCastCreatureWatcher.java
new file mode 100644
index 0000000000..5633d9e5cb
--- /dev/null
+++ b/Mage/src/mage/watchers/common/PlayerCastCreatureWatcher.java
@@ -0,0 +1,81 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.watchers.common;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import mage.constants.CardType;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.stack.Spell;
+import mage.watchers.Watcher;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class PlayerCastCreatureWatcher extends Watcher {
+
+    Set<UUID> playerIds = new HashSet<>();
+
+    public PlayerCastCreatureWatcher() {
+        super("PlayerCastCreature", WatcherScope.GAME);
+    }
+
+    public PlayerCastCreatureWatcher(final PlayerCastCreatureWatcher watcher) {
+        super(watcher);
+        this.playerIds.addAll(watcher.playerIds);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.SPELL_CAST) {
+            Spell spell = (Spell) game.getObject(event.getTargetId());
+            if (spell.getCardType().contains(CardType.CREATURE)) {
+                playerIds.add(spell.getControllerId());
+            }
+        }
+    }
+
+    @Override
+    public PlayerCastCreatureWatcher copy() {
+        return new PlayerCastCreatureWatcher(this);
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        playerIds.clear();
+    }
+
+    public boolean playerDidCastCreatureThisTurn(UUID playerId) {
+        return playerIds.contains(playerId);
+    }
+}