From 4af606883e80e518a23abc469c2c70e528098c60 Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Sat, 31 May 2014 22:01:32 +0300
Subject: [PATCH] [refactor] removed generic parameter from Watcher

---
 Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java       | 2 +-
 Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java   | 2 +-
 .../src/mage/sets/alarareborn/UnscytheKillerOfKings.java      | 2 +-
 Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java     | 2 +-
 Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java | 2 +-
 .../src/mage/sets/betrayersofkamigawa/KumanosBlessing.java    | 2 +-
 .../src/mage/sets/bornofthegods/EpharaGodOfThePolis.java      | 2 +-
 .../src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java     | 2 +-
 .../mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java  | 2 +-
 .../mage/sets/championsofkamigawa/FloatingDreamZubera.java    | 2 +-
 .../src/mage/sets/championsofkamigawa/SiftThroughSands.java   | 2 +-
 Mage.Sets/src/mage/sets/commander2013/FellShepherd.java       | 2 +-
 .../src/mage/sets/commander2013/JelevaNephaliasScourge.java   | 2 +-
 Mage.Sets/src/mage/sets/commander2013/OpalPalace.java         | 2 +-
 Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java  | 2 +-
 Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java      | 2 +-
 Mage.Sets/src/mage/sets/eventide/DreamThief.java              | 2 +-
 Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java       | 2 +-
 Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java          | 2 +-
 Mage.Sets/src/mage/sets/eventide/SoulReap.java                | 2 +-
 Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java        | 2 +-
 Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java       | 2 +-
 Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java      | 2 +-
 Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java           | 2 +-
 Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java    | 2 +-
 Mage.Sets/src/mage/sets/guildpact/Quicken.java                | 2 +-
 Mage.Sets/src/mage/sets/iceage/TinderWall.java                | 2 +-
 Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java       | 2 +-
 Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java          | 2 +-
 Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java         | 4 ++--
 Mage.Sets/src/mage/sets/magic2013/FaithsReward.java           | 2 +-
 Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java        | 2 +-
 Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java         | 2 +-
 Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java           | 2 +-
 Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java    | 2 +-
 Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java            | 2 +-
 Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java | 2 +-
 Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java       | 2 +-
 Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java     | 2 +-
 Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java     | 2 +-
 Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java    | 2 +-
 Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java | 2 +-
 Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java         | 2 +-
 Mage.Sets/src/mage/sets/theros/TritonTactics.java             | 2 +-
 Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java         | 2 +-
 Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java         | 2 +-
 Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java           | 2 +-
 Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java             | 2 +-
 Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java       | 2 +-
 Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java          | 2 +-
 Mage.Sets/src/mage/sets/zendikar/CobraTrap.java               | 2 +-
 Mage.Sets/src/mage/sets/zendikar/Gomazoa.java                 | 2 +-
 Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java             | 2 +-
 Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java            | 2 +-
 Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java          | 2 +-
 Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java           | 2 +-
 Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java           | 2 +-
 Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java           | 2 +-
 Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java            | 2 +-
 Mage/src/mage/abilities/keyword/MadnessAbility.java           | 2 +-
 Mage/src/mage/watchers/Watcher.java                           | 4 ++--
 Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java    | 2 +-
 Mage/src/mage/watchers/common/BloodthirstWatcher.java         | 2 +-
 .../mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java | 2 +-
 .../mage/watchers/common/CardsPutIntoGraveyardWatcher.java    | 2 +-
 Mage/src/mage/watchers/common/CastFromHandWatcher.java        | 2 +-
 Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java   | 2 +-
 .../mage/watchers/common/CommanderCombatDamageWatcher.java    | 2 +-
 Mage/src/mage/watchers/common/DamagedByWatcher.java           | 2 +-
 Mage/src/mage/watchers/common/LandfallWatcher.java            | 2 +-
 Mage/src/mage/watchers/common/MiracleWatcher.java             | 2 +-
 Mage/src/mage/watchers/common/MorbidWatcher.java              | 2 +-
 .../mage/watchers/common/PlayerDamagedBySourceWatcher.java    | 2 +-
 Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java    | 2 +-
 Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java      | 2 +-
 Mage/src/mage/watchers/common/ProwlWatcher.java               | 2 +-
 Mage/src/mage/watchers/common/SoulbondWatcher.java            | 2 +-
 Mage/src/mage/watchers/common/SourceDidDamageWatcher.java     | 2 +-
 78 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java
index 9708fc1aaf..a5248107a9 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java
@@ -114,7 +114,7 @@ class MaelstromNexusTriggeredAbility extends TriggeredAbilityImpl<MaelstromNexus
     }
 }
 
-class FirstSpellCastThisTurnWatcher extends Watcher<FirstSpellCastThisTurnWatcher> {
+class FirstSpellCastThisTurnWatcher extends Watcher {
 
     int spellCount = 0;
 
diff --git a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java
index e2639dc825..8892f5761c 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/PredatoryAdvantage.java
@@ -96,7 +96,7 @@ class DidNotCastCreatureCondition implements Condition {
     }
 }
 
-class CastCreatureWatcher extends Watcher<CastCreatureWatcher> {
+class CastCreatureWatcher extends Watcher {
 
     public CastCreatureWatcher() {
         super("CastCreature", WatcherScope.CARD);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java
index 97f9f346c8..dc37cd6f64 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java
@@ -167,7 +167,7 @@ class UnscytheEffect extends OneShotEffect<UnscytheEffect> {
     }
 }
 
-class EquippedDidDamageWatcher extends Watcher<EquippedDidDamageWatcher> {
+class EquippedDidDamageWatcher extends Watcher {
 
     public List<UUID> equippedDamagedTargets = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java
index ec1a1478d6..abfb2f8df9 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java
@@ -172,7 +172,7 @@ class CavernOfSoulsManaCondition extends CreatureCastManaCondition {
     }
 }
 
-class CavernOfSoulsWatcher extends Watcher<CavernOfSoulsWatcher> {
+class CavernOfSoulsWatcher extends Watcher {
 
     public List<UUID> spells = new ArrayList<>();
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java
index 3b5e2f14c0..8df27754c4 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoblinCohort.java
@@ -121,7 +121,7 @@ class GoblinCohortEffect extends RestrictionEffect<GoblinCohortEffect> {
     }
 }
 
-class PlayerCastCreatureWatcher extends Watcher<PlayerCastCreatureWatcher> {
+class PlayerCastCreatureWatcher extends Watcher {
 
     Set<UUID> playerIds = new HashSet<>();
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java
index f2b57c3b69..ab880bf70e 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java
@@ -134,7 +134,7 @@ class KumanosBlessingEffect extends ReplacementEffectImpl<KumanosBlessingEffect>
 
 }
 
-class DamagedByEnchantedWatcher extends Watcher<DamagedByEnchantedWatcher> {
+class DamagedByEnchantedWatcher extends Watcher {
 
     public List<UUID> damagedCreatures = new ArrayList<>();
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java b/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java
index fa51924b15..f2a71e7d38 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/EpharaGodOfThePolis.java
@@ -108,7 +108,7 @@ class HadAnotherCreatureEnterTheBattlefieldCondition implements Condition {
     }
 }
 
-class CreatureEnteredBattlefieldLastTurnWatcher extends Watcher<CreatureEnteredBattlefieldLastTurnWatcher> {
+class CreatureEnteredBattlefieldLastTurnWatcher extends Watcher {
 
     private boolean anotherCreatureEntered = false;
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java
index c585e9b76e..0657e6d771 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java
@@ -74,7 +74,7 @@ public class SpiritOfTheLabyrinth extends CardImpl<SpiritOfTheLabyrinth> {
     }
 }
 
-class SpiritOfTheLabyrinthWatcher extends Watcher<SpiritOfTheLabyrinthWatcher> {
+class SpiritOfTheLabyrinthWatcher extends Watcher {
 
     public SpiritOfTheLabyrinthWatcher() {
         super("DrewCard", WatcherScope.PLAYER);
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java
index ed80192163..eea5e89a63 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java
@@ -90,7 +90,7 @@ public class BoseijuWhoSheltersAll extends CardImpl<BoseijuWhoSheltersAll> {
     }
 }
 
-class BoseijuWhoSheltersAllWatcher extends Watcher<BoseijuWhoSheltersAllWatcher> {
+class BoseijuWhoSheltersAllWatcher extends Watcher {
 
     public List<UUID> spells = new ArrayList<>();
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java
index c85783f06c..f64d40a76c 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java
@@ -75,7 +75,7 @@ public class FloatingDreamZubera extends CardImpl<FloatingDreamZubera> {
 }
 
 
-class ZuberasDiedWatcher extends Watcher<ZuberasDiedWatcher> {
+class ZuberasDiedWatcher extends Watcher {
 
     public int zuberasDiedThisTurn = 0;
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java
index 74db27ae5d..b3e3059330 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java
@@ -99,7 +99,7 @@ class SiftThroughSandsCondition implements Condition {
     }
 }
 
-class SiftThroughSandsWatcher extends Watcher<SiftThroughSandsWatcher> {
+class SiftThroughSandsWatcher extends Watcher {
 
     boolean castPeerThroughDepths = false;
     boolean castReachThroughMists = false;
diff --git a/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java b/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java
index bf1b120098..bf9a66cbd7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java
+++ b/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java
@@ -99,7 +99,7 @@ public class FellShepherd extends CardImpl<FellShepherd> {
     }
 }
 
-class FellShepherdWatcher extends Watcher<FellShepherdWatcher> {
+class FellShepherdWatcher extends Watcher {
 
     private Set<UUID> creatureIds = new HashSet<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java b/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java
index 1ec4eb2278..1afa0753c8 100644
--- a/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/JelevaNephaliasScourge.java
@@ -172,7 +172,7 @@ class JelevaNephaliasCastEffect extends OneShotEffect<JelevaNephaliasCastEffect>
     }
 }
 
-class JelevaNephaliasWatcher extends Watcher<JelevaNephaliasWatcher> {
+class JelevaNephaliasWatcher extends Watcher {
 
     private Map<Integer, Integer> manaSpendToCast = new HashMap<Integer, Integer>(); // cast
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java b/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java
index 9000c879e3..3ec430cafe 100644
--- a/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java
+++ b/Mage.Sets/src/mage/sets/commander2013/OpalPalace.java
@@ -162,7 +162,7 @@ class OpalPalaceManaEffect extends ManaEffect<OpalPalaceManaEffect> {
     }
 }
 
-class OpalPalaceWatcher extends Watcher<OpalPalaceWatcher> {
+class OpalPalaceWatcher extends Watcher {
 
     public List<UUID> commanderId = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java
index 9ecf65f64b..d0bd768d57 100644
--- a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java
+++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java
@@ -78,7 +78,7 @@ public class CurseOfExhaustion extends CardImpl<CurseOfExhaustion> {
     }
 }
 
-class CurseOfExhaustionWatcher extends Watcher<CurseOfExhaustionWatcher> {
+class CurseOfExhaustionWatcher extends Watcher {
 
     public CurseOfExhaustionWatcher() {
         super("SpellCast", WatcherScope.PLAYER);
diff --git a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java
index 0c2674783f..e3d78755c2 100644
--- a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java
+++ b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java
@@ -155,7 +155,7 @@ class DungeonGeistsEffect extends ReplacementEffectImpl<DungeonGeistsEffect> {
     }
 }
 
-class DungeonGeistsWatcher extends Watcher<DungeonGeistsWatcher> {
+class DungeonGeistsWatcher extends Watcher {
 
     DungeonGeistsWatcher () {
         super("ControlLost", WatcherScope.CARD);
diff --git a/Mage.Sets/src/mage/sets/eventide/DreamThief.java b/Mage.Sets/src/mage/sets/eventide/DreamThief.java
index 3f66b3a217..a81a031a89 100644
--- a/Mage.Sets/src/mage/sets/eventide/DreamThief.java
+++ b/Mage.Sets/src/mage/sets/eventide/DreamThief.java
@@ -97,7 +97,7 @@ class CastBlueSpellThisTurnCondition implements Condition {
     }
 }
 
-class DreamThiefWatcher extends Watcher<DreamThiefWatcher> {
+class DreamThiefWatcher extends Watcher {
 
     private static final FilterSpell filter = new FilterSpell();
     static {
diff --git a/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java b/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java
index f16ee0dff9..1c27816dcd 100644
--- a/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java
+++ b/Mage.Sets/src/mage/sets/eventide/GroundlingPouncer.java
@@ -119,7 +119,7 @@ class GroundingPouncerCondition implements Condition {
     }
 }
 
-class ActivatedAbilityUsedThisTurnWatcher extends Watcher<ActivatedAbilityUsedThisTurnWatcher> {
+class ActivatedAbilityUsedThisTurnWatcher extends Watcher {
 
     public Set<UUID> activatedThisTurn = new HashSet<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java b/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java
index 600d6b8984..c467b42422 100644
--- a/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java
+++ b/Mage.Sets/src/mage/sets/eventide/HotheadedGiant.java
@@ -98,7 +98,7 @@ class CastRedSpellThisTurnCondition implements Condition {
     }
 }
 
-class HotHeadedGiantWatcher extends Watcher<HotHeadedGiantWatcher> {
+class HotHeadedGiantWatcher extends Watcher {
 
     private static final FilterSpell filter = new FilterSpell();
     static {
diff --git a/Mage.Sets/src/mage/sets/eventide/SoulReap.java b/Mage.Sets/src/mage/sets/eventide/SoulReap.java
index fe6fdd4678..72ad0bc52b 100644
--- a/Mage.Sets/src/mage/sets/eventide/SoulReap.java
+++ b/Mage.Sets/src/mage/sets/eventide/SoulReap.java
@@ -104,7 +104,7 @@ class CastBlackSpellThisTurnCondition implements Condition {
     }
 }
 
-class SoulReapWatcher extends Watcher<SoulReapWatcher> {
+class SoulReapWatcher extends Watcher {
 
     private static final FilterSpell filter = new FilterSpell();
     
diff --git a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java
index d1bf404247..8cba441f1f 100644
--- a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java
+++ b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java
@@ -135,7 +135,7 @@ class CastGreenSpellThisTurnCondition implements Condition {
     }
 }
 
-class TalarasBattalionWatcher extends Watcher<TalarasBattalionWatcher> {
+class TalarasBattalionWatcher extends Watcher {
 
     private static final FilterSpell filter = new FilterSpell();
 
diff --git a/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java b/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java
index ef048e9eaf..23278c009b 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/SylvanLibrary.java
@@ -161,7 +161,7 @@ class SylvanLibraryEffect extends OneShotEffect<SylvanLibraryEffect> {
     }
 }
 
-class CardsDrawnThisTurnWatcher extends Watcher<CardsDrawnThisTurnWatcher> {
+class CardsDrawnThisTurnWatcher extends Watcher {
 
     private final Set<UUID> cardsDrawnThisTurn = new HashSet<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java b/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java
index 141f7c1923..fbd2f433d6 100644
--- a/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java
+++ b/Mage.Sets/src/mage/sets/futuresight/PatriciansScorn.java
@@ -93,7 +93,7 @@ class CastWhiteSpellThisTurnCondition implements Condition {
     }
 }
 
-class PatriciansScornWatcher extends Watcher<PatriciansScornWatcher> {
+class PatriciansScornWatcher extends Watcher {
 
     private static final FilterSpell filter = new FilterSpell();
     static {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java
index 51ea28803c..a30e351c70 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java
@@ -188,7 +188,7 @@ class AureliasFuryCantCastEffect extends ReplacementEffectImpl<AureliasFuryCantC
     }
 }
 
-class AureliasFuryDamagedByWatcher extends Watcher<AureliasFuryDamagedByWatcher> {
+class AureliasFuryDamagedByWatcher extends Watcher {
 
     public List<UUID> damagedCreatures = new ArrayList<UUID>();
     public List<UUID> damagedPlayers = new ArrayList<UUID>();
diff --git a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java
index 56f9c9ada6..9d5ec6b28d 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java
@@ -104,7 +104,7 @@ class IncursionTriggeredAbility extends TriggeredAbilityImpl<IncursionTriggeredA
     }
 }
 
-class IncursionWatcher extends Watcher<IncursionWatcher> {
+class IncursionWatcher extends Watcher {
 
     int spellCount = 0;
 
diff --git a/Mage.Sets/src/mage/sets/guildpact/Quicken.java b/Mage.Sets/src/mage/sets/guildpact/Quicken.java
index dc9402eecf..55216a9ae7 100644
--- a/Mage.Sets/src/mage/sets/guildpact/Quicken.java
+++ b/Mage.Sets/src/mage/sets/guildpact/Quicken.java
@@ -126,7 +126,7 @@ class QuickenAsThoughEffect extends AsThoughEffectImpl<QuickenAsThoughEffect> {
 
 }
 
-class QuickenWatcher extends Watcher<QuickenWatcher> {
+class QuickenWatcher extends Watcher {
 
     public List<String> activeQuickenSpells = new ArrayList<String>();
 
diff --git a/Mage.Sets/src/mage/sets/iceage/TinderWall.java b/Mage.Sets/src/mage/sets/iceage/TinderWall.java
index c561c0d6ba..09f64fd3a0 100644
--- a/Mage.Sets/src/mage/sets/iceage/TinderWall.java
+++ b/Mage.Sets/src/mage/sets/iceage/TinderWall.java
@@ -97,7 +97,7 @@ public class TinderWall extends CardImpl<TinderWall> {
 }
 
 
-class BlockedByWatcher extends Watcher<BlockedByWatcher> {
+class BlockedByWatcher extends Watcher {
 
     public List<UUID> blockedByWatcher = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java
index 8997fd6364..5924889782 100644
--- a/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java
+++ b/Mage.Sets/src/mage/sets/innistrad/CivilizedScholar.java
@@ -80,7 +80,7 @@ public class CivilizedScholar extends CardImpl<CivilizedScholar> {
     }
 }
 
-class HomicidalBruteWatcher extends Watcher<HomicidalBruteWatcher> {
+class HomicidalBruteWatcher extends Watcher {
 
     public HomicidalBruteWatcher() {
         super("HomicidalBruteAttacked", WatcherScope.CARD);
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java b/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java
index 919bc8d7f2..0dd1b9e118 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java
@@ -79,7 +79,7 @@ public class WindbriskHeights extends CardImpl<WindbriskHeights> {
     }
 }
 
-class WindbriskHeightsWatcher extends Watcher<WindbriskHeightsWatcher> {
+class WindbriskHeightsWatcher extends Watcher {
 
     private int numberOfattackers;
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java
index 4fd8233afc..296fac5855 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java
@@ -78,7 +78,7 @@ public class AngelicArbiter extends CardImpl<AngelicArbiter> {
 
 }
 
-class AngelicArbiterWatcher1 extends Watcher<AngelicArbiterWatcher1> {
+class AngelicArbiterWatcher1 extends Watcher {
 
     public AngelicArbiterWatcher1() {
         super("OpponentCastSpell", WatcherScope.PLAYER);
@@ -103,7 +103,7 @@ class AngelicArbiterWatcher1 extends Watcher<AngelicArbiterWatcher1> {
 
 }
 
-class AngelicArbiterWatcher2 extends Watcher<AngelicArbiterWatcher2> {
+class AngelicArbiterWatcher2 extends Watcher {
 
     public AngelicArbiterWatcher2() {
         super("OpponentAttacked", WatcherScope.PLAYER);
diff --git a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java
index 639565bcfb..5ebd34b5aa 100644
--- a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java
+++ b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java
@@ -99,7 +99,7 @@ class FaithsRewardEffect extends OneShotEffect<FaithsRewardEffect> {
     }
 }
 
-class FaithsRewardWatcher extends Watcher<FaithsRewardWatcher> {
+class FaithsRewardWatcher extends Watcher {
     ArrayList<UUID> cards = new ArrayList<UUID>();
 
     public FaithsRewardWatcher() {
diff --git a/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java
index 4d875e21af..5cdc5c4643 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java
@@ -139,7 +139,7 @@ class SavageSummoningAsThoughEffect extends AsThoughEffectImpl<SavageSummoningAs
 }
 
 
-class SavageSummoningWatcher extends Watcher<SavageSummoningWatcher> {
+class SavageSummoningWatcher extends Watcher {
 
     private Set<String> savageSummoningSpells = new HashSet<String>();;
     private Map<UUID, Set<String>> spellsCastWithSavageSummoning = new LinkedHashMap<UUID, Set<String>>();
diff --git a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java
index b735606a50..d524b7d9b3 100644
--- a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java
+++ b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java
@@ -159,7 +159,7 @@ class TidebinderMageEffect extends ReplacementEffectImpl<TidebinderMageEffect> {
     }
 }
 
-class TidebinderMageWatcher extends Watcher<TidebinderMageWatcher> {
+class TidebinderMageWatcher extends Watcher {
 
     TidebinderMageWatcher () {
         super("ControlLost", WatcherScope.CARD);
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java
index 0cc88ceaaf..cc3b0ff183 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java
@@ -101,7 +101,7 @@ class SecondSunriseEffect extends OneShotEffect<SecondSunriseEffect> {
     }
 }
 
-class SecondSunriseWatcher extends Watcher<SecondSunriseWatcher> {
+class SecondSunriseWatcher extends Watcher {
     ArrayList<UUID> cards = new ArrayList<UUID>();
 
     public SecondSunriseWatcher() {
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java
index b40bde34d7..c4f8a1bf9a 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java
@@ -135,7 +135,7 @@ class CathedralMembraneEffect extends OneShotEffect<CathedralMembraneEffect> {
     }
 }
 
-class CathedralMembraneWatcher extends Watcher<CathedralMembraneWatcher> {
+class CathedralMembraneWatcher extends Watcher {
 
     public List<UUID> blockedCreatures = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java
index af9b05329f..725bfa1e00 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java
@@ -71,7 +71,7 @@ public class FreshMeat extends CardImpl<FreshMeat> {
     }
 }
 
-class FreshMeatWatcher extends Watcher<FreshMeatWatcher> {
+class FreshMeatWatcher extends Watcher {
 
     private int creaturesCount = 0;
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java
index bffe75f588..5782ec8069 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CastThroughTime.java
@@ -129,7 +129,7 @@ class GainReboundEffect extends ContinuousEffectImpl<GainReboundEffect> {
 
 class AttachedReboundAbility extends ReboundAbility {}
 
-class LeavesBattlefieldWatcher extends Watcher<LeavesBattlefieldWatcher> {
+class LeavesBattlefieldWatcher extends Watcher {
 
     public LeavesBattlefieldWatcher() {
         super("LeavesBattlefieldWatcher", WatcherScope.CARD);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java
index 6f45f6f5f2..c93e523170 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java
@@ -108,7 +108,7 @@ class VengevineAbility extends TriggeredAbilityImpl<VengevineAbility> {
 }
 
 
-class VengevineWatcher extends Watcher<VengevineWatcher> {
+class VengevineWatcher extends Watcher {
 
     int creatureSpellCount = 0;
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java
index 47c13475fc..4578dbbb8a 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java
@@ -78,7 +78,7 @@ public class FleshAllergy extends CardImpl<FleshAllergy> {
     }
 }
 
-class FleshAllergyWatcher extends Watcher<FleshAllergyWatcher> {
+class FleshAllergyWatcher extends Watcher {
 
     public int creaturesDiedThisTurn = 0;
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java
index d170502e20..d03bea405c 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java
@@ -116,7 +116,7 @@ class MoltenPsycheEffect extends OneShotEffect<MoltenPsycheEffect> {
 
 }
 
-class MoltenPsycheWatcher extends Watcher<MoltenPsycheWatcher> {
+class MoltenPsycheWatcher extends Watcher {
 
     private final Map<UUID, Integer> draws = new HashMap<>();
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java
index 8ee72d8c52..a34b2d3547 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java
@@ -114,7 +114,7 @@ class SteelHellkiteDestroyEffect extends OneShotEffect {
     }
 }
 
-class SteelHellkiteWatcher extends Watcher<SteelHellkiteWatcher> {
+class SteelHellkiteWatcher extends Watcher {
 
     public List<UUID> damagedPlayers = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java
index 9add8f4c14..4ab1f70c15 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java
@@ -73,7 +73,7 @@ public class EtherswornCanonist extends CardImpl<EtherswornCanonist> {
     }
 }
 
-class EtherswornCanonistWatcher extends Watcher<EtherswornCanonistWatcher> {
+class EtherswornCanonistWatcher extends Watcher {
 
     private Map<UUID, Boolean> castNonartifactSpell = new HashMap<UUID, Boolean>();
     
diff --git a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java
index 011efd4811..3b645804e1 100644
--- a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java
+++ b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java
@@ -144,7 +144,7 @@ class ShipbreakerKrakenReplacementEffect extends ReplacementEffectImpl<Shipbreak
     }
 }
 
-class ShipbreakerKrakenWatcher extends Watcher<ShipbreakerKrakenWatcher> {
+class ShipbreakerKrakenWatcher extends Watcher {
 
     ShipbreakerKrakenWatcher () {
         super("ControlLost", WatcherScope.CARD);
diff --git a/Mage.Sets/src/mage/sets/theros/TritonTactics.java b/Mage.Sets/src/mage/sets/theros/TritonTactics.java
index f8692fcd4e..04d5d82b7a 100644
--- a/Mage.Sets/src/mage/sets/theros/TritonTactics.java
+++ b/Mage.Sets/src/mage/sets/theros/TritonTactics.java
@@ -206,7 +206,7 @@ class TritonTacticsEndOfCombatEffect extends OneShotEffect<TritonTacticsEndOfCom
     }
 }
 
-class BlockedCreaturesWatcher extends Watcher<BlockedCreaturesWatcher> {
+class BlockedCreaturesWatcher extends Watcher {
 
     public BlockedCreaturesWatcher() {
         super("BlockedCreatures", WatcherScope.CARD);
diff --git a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java
index eebf6cbb6b..f6fc56607d 100644
--- a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java
+++ b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java
@@ -79,7 +79,7 @@ public class PermafrostTrap extends CardImpl<PermafrostTrap> {
     }
 }
 
-class PermafrostTrapWatcher extends Watcher<PermafrostTrapWatcher> {
+class PermafrostTrapWatcher extends Watcher {
 
     public PermafrostTrapWatcher() {
         super("PermafrostTrapWatcher", WatcherScope.GAME);
diff --git a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java
index a9f27c2061..fa790918d0 100644
--- a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java
+++ b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java
@@ -83,7 +83,7 @@ public class RefractionTrap extends CardImpl<RefractionTrap> {
     }
 }
 
-class RefractionTrapWatcher extends Watcher<RefractionTrapWatcher> {
+class RefractionTrapWatcher extends Watcher {
 
     public RefractionTrapWatcher() {
         super("RefractionTrapWatcher", WatcherScope.GAME);
diff --git a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java
index 8974dba03a..3b669aeca0 100644
--- a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java
+++ b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java
@@ -86,7 +86,7 @@ public class RicochetTrap extends CardImpl<RicochetTrap> {
     }
 }
 
-class RicochetTrapWatcher extends Watcher<RicochetTrapWatcher> {
+class RicochetTrapWatcher extends Watcher {
 
     public RicochetTrapWatcher() {
         super("RicochetTrapWatcher", WatcherScope.GAME);
diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java
index f0d467f1b2..d9bb1fcbdc 100644
--- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java
@@ -73,7 +73,7 @@ public class ArchiveTrap extends CardImpl<ArchiveTrap> {
 
 }
 
-class ArchiveTrapWatcher extends Watcher<ArchiveTrapWatcher> {
+class ArchiveTrapWatcher extends Watcher {
 
     public ArchiveTrapWatcher() {
         super("LibrarySearched", WatcherScope.PLAYER);
diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java
index 1c546e0915..b167818cfe 100644
--- a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java
+++ b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java
@@ -108,7 +108,7 @@ class ArchmageAscensionTriggeredAbility extends TriggeredAbilityImpl<ArchmageAsc
     }
 }
 
-class CardsDrawnControllerWatcher extends Watcher<CardsDrawnControllerWatcher> {
+class CardsDrawnControllerWatcher extends Watcher {
 
     int cardsDrawn;
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java
index c9c31f7edd..63db6d2668 100644
--- a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java
@@ -76,7 +76,7 @@ public class BalothCageTrap extends CardImpl<BalothCageTrap> {
     }
 }
 
-class BalothCageTrapWatcher extends Watcher<BalothCageTrapWatcher> {
+class BalothCageTrapWatcher extends Watcher {
 
     public BalothCageTrapWatcher() {
         super("BalothCageTrapWatcher", WatcherScope.GAME);
diff --git a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java
index 97db88dd31..17742900b6 100644
--- a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java
@@ -78,7 +78,7 @@ public class CobraTrap extends CardImpl<CobraTrap> {
     }
 }
 
-class CobraTrapWatcher extends Watcher<CobraTrapWatcher> {
+class CobraTrapWatcher extends Watcher {
 
     public CobraTrapWatcher() {
         super("noncreature permanent destroyed", WatcherScope.PLAYER);
diff --git a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java
index 702abe19a7..5faa0e345c 100644
--- a/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java
+++ b/Mage.Sets/src/mage/sets/zendikar/Gomazoa.java
@@ -140,7 +140,7 @@ class GomazoaEffect extends OneShotEffect<GomazoaEffect> {
     }
 }
 
-class BlockedByWatcher extends Watcher<BlockedByWatcher> {
+class BlockedByWatcher extends Watcher {
 
     public List<UUID> blockedByWatcher = new ArrayList<>();
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java
index 26fc4c4b56..0b864771ef 100644
--- a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java
@@ -75,7 +75,7 @@ public class InfernoTrap extends CardImpl<InfernoTrap> {
     }
 }
 
-class ControllerDamagedByCreatureWatcher extends Watcher<ControllerDamagedByCreatureWatcher> {
+class ControllerDamagedByCreatureWatcher extends Watcher {
 
     int numCreaturesDamagedController;
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
index 36f59abc68..14d79302fd 100644
--- a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
@@ -81,7 +81,7 @@ public class LavaballTrap extends CardImpl<LavaballTrap> {
     }
 }
 
-class LavaballTrapWatcher extends Watcher<LavaballTrapWatcher> {
+class LavaballTrapWatcher extends Watcher {
 
     private Map<UUID, Integer> amountOfLandsPlayedThisTurn = new HashMap<UUID, Integer>();
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
index 3f481b6f09..501d69e429 100644
--- a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
+++ b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
@@ -143,7 +143,7 @@ class MerfolkToken extends Token {
     }
 }
 
-class CastedSpellsWithSpellTarget extends Watcher<CastedSpellsWithSpellTarget> {
+class CastedSpellsWithSpellTarget extends Watcher {
 
     // <SourceId_TargetSpellId, controllerId>
     private Map<String, UUID> casted = new HashMap<String, UUID>();
diff --git a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java
index e664cca9b9..2217bebbab 100644
--- a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java
@@ -82,7 +82,7 @@ public class MindbreakTrap extends CardImpl<MindbreakTrap> {
     }
 }
 
-class MindbreakTrapWatcher extends Watcher<MindbreakTrapWatcher> {
+class MindbreakTrapWatcher extends Watcher {
 
     private Map<UUID, Integer> counts = new HashMap<UUID, Integer>();
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java
index 0509fe6c53..6e6f0471be 100644
--- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java
@@ -105,7 +105,7 @@ class TargetPlayerCardsInHandCount implements DynamicValue {
     }
 }
 
-class CardsDrawnOpponentWatcher extends Watcher<CardsDrawnOpponentWatcher> {
+class CardsDrawnOpponentWatcher extends Watcher {
 
     int cardsDrawn;
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java
index 2ae8242abe..5478366b74 100644
--- a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java
@@ -88,7 +88,7 @@ public class SummoningTrap extends CardImpl<SummoningTrap> {
     }
 }
 
-class SummoningTrapWatcher extends Watcher<SummoningTrapWatcher> {
+class SummoningTrapWatcher extends Watcher {
 
     public SummoningTrapWatcher() {
         super("CreatureSpellCountered", WatcherScope.PLAYER);
diff --git a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java
index 443a5ce8cf..3c138a9465 100644
--- a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java
@@ -78,7 +78,7 @@ public class WhiplashTrap extends CardImpl<WhiplashTrap> {
     }
 }
 
-class WhiplashTrapWatcher extends Watcher<WhiplashTrapWatcher> {
+class WhiplashTrapWatcher extends Watcher {
 
     private Map<UUID, Integer> amountOfCreaturesPlayedThisTurn = new HashMap<UUID, Integer>();
 
diff --git a/Mage/src/mage/abilities/keyword/MadnessAbility.java b/Mage/src/mage/abilities/keyword/MadnessAbility.java
index b2820c8190..3ce2229140 100644
--- a/Mage/src/mage/abilities/keyword/MadnessAbility.java
+++ b/Mage/src/mage/abilities/keyword/MadnessAbility.java
@@ -214,7 +214,7 @@ class MadnessExileEffect extends OneShotEffect<MadnessExileEffect> {
 /**
  * Whenever phase is changed, this watcher returns all cards exiled by madness to graveyard and informs players about it.
  */
-class MadnessCleanUpWatcher extends Watcher<MadnessCleanUpWatcher> {
+class MadnessCleanUpWatcher extends Watcher {
 
     public MadnessCleanUpWatcher() {
         super("MadnessPlayWasCanceled", WatcherScope.GAME);
diff --git a/Mage/src/mage/watchers/Watcher.java b/Mage/src/mage/watchers/Watcher.java
index 4040e98df9..180b7aac83 100644
--- a/Mage/src/mage/watchers/Watcher.java
+++ b/Mage/src/mage/watchers/Watcher.java
@@ -40,7 +40,7 @@ import mage.game.events.GameEvent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class Watcher<T extends Watcher<T>> implements Serializable {
+public abstract class Watcher implements Serializable {
 
     protected UUID controllerId;
     protected UUID sourceId;
@@ -99,5 +99,5 @@ public abstract class Watcher<T extends Watcher<T>> implements Serializable {
 
     public abstract void watch(GameEvent event, Game game);
 
-    public abstract T copy();
+    public abstract Watcher copy();
 }
diff --git a/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java b/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java
index b4fd2e145e..9e84bc3dfd 100644
--- a/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java
+++ b/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java
@@ -39,7 +39,7 @@ import java.util.UUID;
 /**
  * @author magenoxx_at_gmail.com
  */
-public class AttackedThisTurnWatcher extends Watcher<AttackedThisTurnWatcher> {
+public class AttackedThisTurnWatcher extends Watcher {
 
     public Set<UUID> attackedThisTurnCreatures = new HashSet<UUID>();
 
diff --git a/Mage/src/mage/watchers/common/BloodthirstWatcher.java b/Mage/src/mage/watchers/common/BloodthirstWatcher.java
index 19c98e9a7c..f1b260d76f 100644
--- a/Mage/src/mage/watchers/common/BloodthirstWatcher.java
+++ b/Mage/src/mage/watchers/common/BloodthirstWatcher.java
@@ -39,7 +39,7 @@ import java.util.UUID;
  * Must be installed to player for proper Bloodthirst work
  * @author Loki
  */
-public class BloodthirstWatcher extends Watcher<BloodthirstWatcher> {
+public class BloodthirstWatcher extends Watcher {
     public BloodthirstWatcher(UUID controllerId) {
         super("DamagedOpponents", WatcherScope.PLAYER);
         this.controllerId = controllerId;
diff --git a/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java b/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java
index ac8e65f4be..04918b46c7 100644
--- a/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java
+++ b/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java
@@ -46,7 +46,7 @@ import mage.watchers.Watcher;
  * 
  */
 
-public class CardsDrawnDuringDrawStepWatcher extends Watcher<CardsDrawnDuringDrawStepWatcher> {
+public class CardsDrawnDuringDrawStepWatcher extends Watcher {
 
     private final Map<UUID, Integer> amountOfCardsDrawnThisTurn = new HashMap<>();
 
diff --git a/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java b/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java
index bbaafe5934..28cff22b70 100644
--- a/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java
+++ b/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java
@@ -47,7 +47,7 @@ import mage.watchers.Watcher;
  *
  * @author LevelX2
  */
-public class CardsPutIntoGraveyardWatcher extends Watcher<CardsPutIntoGraveyardWatcher> {
+public class CardsPutIntoGraveyardWatcher extends Watcher {
 
     private final Map<UUID, Integer> amountOfCardsThisTurn = new HashMap<UUID, Integer>();
     private final Set<UUID> cardsPutToGraveyardFromBattlefield = new HashSet<UUID>();
diff --git a/Mage/src/mage/watchers/common/CastFromHandWatcher.java b/Mage/src/mage/watchers/common/CastFromHandWatcher.java
index 084827e8ca..3aee2d79fd 100644
--- a/Mage/src/mage/watchers/common/CastFromHandWatcher.java
+++ b/Mage/src/mage/watchers/common/CastFromHandWatcher.java
@@ -7,7 +7,7 @@ import mage.game.events.GameEvent;
 import mage.game.stack.Spell;
 import mage.watchers.Watcher;
 
-public class CastFromHandWatcher extends Watcher<CastFromHandWatcher> {
+public class CastFromHandWatcher extends Watcher {
     public CastFromHandWatcher() {
         super("CastFromHand", WatcherScope.CARD);
     }
diff --git a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
index 98c9fdaafe..57772f2dd2 100644
--- a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
+++ b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
@@ -42,7 +42,7 @@ import mage.watchers.Watcher;
 *
 * @author nantuko, BetaSteward_at_googlemail.com
 */
-public class CastSpellLastTurnWatcher extends Watcher<CastSpellLastTurnWatcher> {
+public class CastSpellLastTurnWatcher extends Watcher {
 
     private final Map<UUID, Integer> amountOfSpellsCastOnPrevTurn = new HashMap<>();
     private final Map<UUID, Integer> amountOfSpellsCastOnCurrentTurn = new HashMap<>();
diff --git a/Mage/src/mage/watchers/common/CommanderCombatDamageWatcher.java b/Mage/src/mage/watchers/common/CommanderCombatDamageWatcher.java
index cab92598eb..c3d42a65ba 100644
--- a/Mage/src/mage/watchers/common/CommanderCombatDamageWatcher.java
+++ b/Mage/src/mage/watchers/common/CommanderCombatDamageWatcher.java
@@ -48,7 +48,7 @@ import mage.watchers.Watcher;
  *
  * @author Plopman
  */
-public class CommanderCombatDamageWatcher extends Watcher<CommanderCombatDamageWatcher> {
+public class CommanderCombatDamageWatcher extends Watcher {
 
     public Map<UUID, Integer> damageToPlayer = new HashMap<UUID, Integer>();
 
diff --git a/Mage/src/mage/watchers/common/DamagedByWatcher.java b/Mage/src/mage/watchers/common/DamagedByWatcher.java
index 1f846ca109..f91ba57d48 100644
--- a/Mage/src/mage/watchers/common/DamagedByWatcher.java
+++ b/Mage/src/mage/watchers/common/DamagedByWatcher.java
@@ -41,7 +41,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DamagedByWatcher extends Watcher<DamagedByWatcher> {
+public class DamagedByWatcher extends Watcher {
 
     public List<UUID> damagedCreatures = new ArrayList<>();
 
diff --git a/Mage/src/mage/watchers/common/LandfallWatcher.java b/Mage/src/mage/watchers/common/LandfallWatcher.java
index b4876e8c2f..3a0a659c6e 100644
--- a/Mage/src/mage/watchers/common/LandfallWatcher.java
+++ b/Mage/src/mage/watchers/common/LandfallWatcher.java
@@ -11,7 +11,7 @@ import mage.watchers.Watcher;
  * @author BetaSteward_at_googlemail.com
  * @author Loki
  */
-public class LandfallWatcher extends Watcher<LandfallWatcher> {
+public class LandfallWatcher extends Watcher {
 
     public LandfallWatcher() {
         super("LandPlayed", WatcherScope.PLAYER);
diff --git a/Mage/src/mage/watchers/common/MiracleWatcher.java b/Mage/src/mage/watchers/common/MiracleWatcher.java
index b02d3a2cdb..63677fd33b 100644
--- a/Mage/src/mage/watchers/common/MiracleWatcher.java
+++ b/Mage/src/mage/watchers/common/MiracleWatcher.java
@@ -55,7 +55,7 @@ import mage.watchers.Watcher;
  *
  * @author noxx
  */
-public class MiracleWatcher extends Watcher<MiracleWatcher> {
+public class MiracleWatcher extends Watcher {
 
     private final Map<UUID, Integer> amountOfCardsDrawnThisTurn = new HashMap<>();
 
diff --git a/Mage/src/mage/watchers/common/MorbidWatcher.java b/Mage/src/mage/watchers/common/MorbidWatcher.java
index f6cf64d713..14220eed22 100644
--- a/Mage/src/mage/watchers/common/MorbidWatcher.java
+++ b/Mage/src/mage/watchers/common/MorbidWatcher.java
@@ -41,7 +41,7 @@ import mage.watchers.Watcher;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class MorbidWatcher extends Watcher<MorbidWatcher> {
+public class MorbidWatcher extends Watcher {
 
     public MorbidWatcher() {
         super("Morbid", WatcherScope.GAME);
diff --git a/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java b/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java
index efb75b53d2..63ff552cb1 100644
--- a/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java
+++ b/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java
@@ -42,7 +42,7 @@ import mage.watchers.Watcher;
  * 
  * @author LevelX
  */
-public class PlayerDamagedBySourceWatcher extends Watcher<PlayerDamagedBySourceWatcher> {
+public class PlayerDamagedBySourceWatcher extends Watcher {
 
     private Set<String> damageSourceIds = new HashSet<String>();
 
diff --git a/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java b/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java
index f91b664a4f..e8160afbfb 100644
--- a/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java
+++ b/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java
@@ -45,7 +45,7 @@ import mage.watchers.Watcher;
  *
  * @author LevelX2
  */
-public class PlayerGainedLifeWatcher extends Watcher<PlayerGainedLifeWatcher> {
+public class PlayerGainedLifeWatcher extends Watcher {
 
     private Map<UUID, Integer> amountOfLifeGainedThisTurn = new HashMap<UUID, Integer>();
 
diff --git a/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java b/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java
index f2223f3e48..71c91aa75d 100644
--- a/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java
+++ b/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java
@@ -45,7 +45,7 @@ import mage.watchers.Watcher;
  *
  * @author LevelX2
  */
-public class PlayerLostLifeWatcher extends Watcher<PlayerLostLifeWatcher> {
+public class PlayerLostLifeWatcher extends Watcher {
 
     private final Map<UUID, Integer> amountOfLifeLostThisTurn = new HashMap<>();
 
diff --git a/Mage/src/mage/watchers/common/ProwlWatcher.java b/Mage/src/mage/watchers/common/ProwlWatcher.java
index 0b064e5c7b..c10c30082a 100644
--- a/Mage/src/mage/watchers/common/ProwlWatcher.java
+++ b/Mage/src/mage/watchers/common/ProwlWatcher.java
@@ -49,7 +49,7 @@ import mage.watchers.Watcher;
  *
  * @author LevelX
  */
-public class ProwlWatcher extends Watcher<ProwlWatcher> {
+public class ProwlWatcher extends Watcher {
 
     private Map<UUID, Set<String>> damagingSubtypes = new HashMap<UUID, Set<String>>();
     private Set<UUID> allSubtypes = new HashSet<UUID>();
diff --git a/Mage/src/mage/watchers/common/SoulbondWatcher.java b/Mage/src/mage/watchers/common/SoulbondWatcher.java
index 00d7932bf4..7164f0fb69 100644
--- a/Mage/src/mage/watchers/common/SoulbondWatcher.java
+++ b/Mage/src/mage/watchers/common/SoulbondWatcher.java
@@ -51,7 +51,7 @@ import mage.watchers.Watcher;
  *
  * @author noxx
  */
-public class SoulbondWatcher extends Watcher<SoulbondWatcher> {
+public class SoulbondWatcher extends Watcher {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another not paired creature you control");
 
diff --git a/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java b/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java
index b1c96fb29e..94072d1ddb 100644
--- a/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java
+++ b/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java
@@ -42,7 +42,7 @@ import java.util.UUID;
  *
  * @author jeffwadsworth
  */
-public class SourceDidDamageWatcher extends Watcher<SourceDidDamageWatcher> {
+public class SourceDidDamageWatcher extends Watcher {
 
     public List<UUID> damageSources = new ArrayList<UUID>();