diff --git a/Mage.Sets/src/mage/cards/b/BellowingElk.java b/Mage.Sets/src/mage/cards/b/BellowingElk.java index 79d1ebc2b54..7bdef947828 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingElk.java +++ b/Mage.Sets/src/mage/cards/b/BellowingElk.java @@ -76,11 +76,6 @@ class BellowingElkWatcher extends Watcher { super(WatcherScope.GAME); } - private BellowingElkWatcher(final BellowingElkWatcher watcher) { - super(watcher); - this.playerMap.putAll(watcher.playerMap); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE) { @@ -102,10 +97,5 @@ class BellowingElkWatcher extends Watcher { Set s = playerMap.getOrDefault(playerId, null); return s != null && s.stream().anyMatch((UUID id) -> (id != creatureId)); } - - @Override - public BellowingElkWatcher copy() { - return new BellowingElkWatcher(this); - } } // I'm not THAT loud... diff --git a/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java b/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java index c13928044bb..8d82cb6d1e5 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java +++ b/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java @@ -140,11 +140,6 @@ class ChainerNightmareAdeptWatcher extends Watcher { super(WatcherScope.CARD); } - ChainerNightmareAdeptWatcher(final ChainerNightmareAdeptWatcher watcher) { - super(watcher); - this.abilityUsed = watcher.abilityUsed; - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) { @@ -155,11 +150,6 @@ class ChainerNightmareAdeptWatcher extends Watcher { } } - @Override - public ChainerNightmareAdeptWatcher copy() { - return new ChainerNightmareAdeptWatcher(this); - } - @Override public void reset() { super.reset(); diff --git a/Mage.Sets/src/mage/cards/d/DeafeningSilence.java b/Mage.Sets/src/mage/cards/d/DeafeningSilence.java index 247b09f06ea..531fbd1cf55 100644 --- a/Mage.Sets/src/mage/cards/d/DeafeningSilence.java +++ b/Mage.Sets/src/mage/cards/d/DeafeningSilence.java @@ -92,13 +92,6 @@ class DeafeningSilenceWatcher extends Watcher { super(WatcherScope.GAME); } - private DeafeningSilenceWatcher(final DeafeningSilenceWatcher watcher) { - super(watcher); - for (Map.Entry entry : watcher.spellsCastByPlayerThisTurnNonCreature.entrySet()) { - spellsCastByPlayerThisTurnNonCreature.put(entry.getKey(), entry.getValue()); - } - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() != GameEvent.EventType.SPELL_CAST) { @@ -125,9 +118,4 @@ class DeafeningSilenceWatcher extends Watcher { public int spellsCastByPlayerThisTurnNonCreature(UUID playerId) { return spellsCastByPlayerThisTurnNonCreature.getOrDefault(playerId, 0); } - - @Override - public DeafeningSilenceWatcher copy() { - return new DeafeningSilenceWatcher(this); - } } diff --git a/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java b/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java index cfdece046c4..7a206429041 100644 --- a/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java +++ b/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java @@ -109,11 +109,6 @@ class GadwickTheWizenedWatcher extends Watcher { super(WatcherScope.GAME); } - private GadwickTheWizenedWatcher(final GadwickTheWizenedWatcher watcher) { - super(watcher); - this.xMap.putAll(watcher.xMap); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() != GameEvent.EventType.SPELL_CAST) { @@ -128,11 +123,6 @@ class GadwickTheWizenedWatcher extends Watcher { ), spell.getSpellAbility().getManaCostsToPay().getX()); } - @Override - public GadwickTheWizenedWatcher copy() { - return new GadwickTheWizenedWatcher(this); - } - @Override public void reset() { super.reset(); diff --git a/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java b/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java index df7f53ce36e..63374c19733 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java +++ b/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java @@ -98,11 +98,6 @@ class GerrardWeatherlightHeroWatcher extends Watcher { super(WatcherScope.GAME); } - private GerrardWeatherlightHeroWatcher(final GerrardWeatherlightHeroWatcher watcher) { - super(watcher); - this.cards.addAll(watcher.cards); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE @@ -118,11 +113,6 @@ class GerrardWeatherlightHeroWatcher extends Watcher { return cards.stream().anyMatch(mageObjectReference -> mageObjectReference.refersTo(card, game)); } - @Override - public GerrardWeatherlightHeroWatcher copy() { - return new GerrardWeatherlightHeroWatcher(this); - } - @Override public void reset() { super.reset(); diff --git a/Mage.Sets/src/mage/cards/i/IdolOfOblivion.java b/Mage.Sets/src/mage/cards/i/IdolOfOblivion.java index bdbdd229991..3e7b2931594 100644 --- a/Mage.Sets/src/mage/cards/i/IdolOfOblivion.java +++ b/Mage.Sets/src/mage/cards/i/IdolOfOblivion.java @@ -81,11 +81,6 @@ class IdolOfOblivionWatcher extends Watcher { super(WatcherScope.GAME); } - private IdolOfOblivionWatcher(final IdolOfOblivionWatcher watcher) { - super(watcher); - playerIds.addAll(watcher.playerIds); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD) { @@ -102,11 +97,6 @@ class IdolOfOblivionWatcher extends Watcher { playerIds.clear(); } - @Override - public IdolOfOblivionWatcher copy() { - return new IdolOfOblivionWatcher(this); - } - boolean tokenEntered(UUID playerId) { return playerIds.contains(playerId); } diff --git a/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java b/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java index a1f77ce079d..1b8349cf815 100644 --- a/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java +++ b/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java @@ -96,12 +96,6 @@ class KadenaSlinkingSorcererWatcher extends Watcher { castFaceDown = new HashSet<>(); } - private KadenaSlinkingSorcererWatcher(final KadenaSlinkingSorcererWatcher watcher) { - super(watcher); - this.castFaceDown = new HashSet<>(); - castFaceDown.addAll(watcher.castFaceDown); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() != GameEvent.EventType.SPELL_CAST) { @@ -118,10 +112,6 @@ class KadenaSlinkingSorcererWatcher extends Watcher { return castFaceDown.contains(playerId); } - @Override - public KadenaSlinkingSorcererWatcher copy() { - return new KadenaSlinkingSorcererWatcher(this); - } @Override public void reset() { diff --git a/Mage.Sets/src/mage/cards/o/OnceUponATime.java b/Mage.Sets/src/mage/cards/o/OnceUponATime.java index 3a3559d9fa9..871e8985a41 100644 --- a/Mage.Sets/src/mage/cards/o/OnceUponATime.java +++ b/Mage.Sets/src/mage/cards/o/OnceUponATime.java @@ -83,16 +83,6 @@ class OnceUponATimeWatcher extends Watcher { super(WatcherScope.GAME); } - private OnceUponATimeWatcher(final OnceUponATimeWatcher watcher) { - super(watcher); - this.castSpells.addAll(watcher.castSpells); - } - - @Override - public OnceUponATimeWatcher copy() { - return new OnceUponATimeWatcher(this); - } - @Override public void watch(GameEvent event, Game game) { if (GameEvent.EventType.SPELL_CAST == event.getType()) { diff --git a/Mage.Sets/src/mage/cards/r/RobberOfTheRich.java b/Mage.Sets/src/mage/cards/r/RobberOfTheRich.java index f86c8b999a5..9562df0bdcb 100644 --- a/Mage.Sets/src/mage/cards/r/RobberOfTheRich.java +++ b/Mage.Sets/src/mage/cards/r/RobberOfTheRich.java @@ -216,15 +216,6 @@ class RobberOfTheRichWatcher extends Watcher { super(WatcherScope.GAME); } - private RobberOfTheRichWatcher(final RobberOfTheRichWatcher watcher) { - super(watcher); - this.rogueAttackers.addAll(watcher.rogueAttackers); - } - - @Override - public RobberOfTheRichWatcher copy() { - return new RobberOfTheRichWatcher(this); - } @Override public void watch(GameEvent event, Game game) { diff --git a/Mage.Sets/src/mage/cards/s/SaddledRimestag.java b/Mage.Sets/src/mage/cards/s/SaddledRimestag.java index 0aa3cd7b7ff..92190b5aab6 100644 --- a/Mage.Sets/src/mage/cards/s/SaddledRimestag.java +++ b/Mage.Sets/src/mage/cards/s/SaddledRimestag.java @@ -70,11 +70,6 @@ class SaddledRimestagWatcher extends Watcher { super(WatcherScope.GAME); } - private SaddledRimestagWatcher(final SaddledRimestagWatcher watcher) { - super(watcher); - this.playerMap.putAll(watcher.playerMap); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE) { @@ -96,9 +91,4 @@ class SaddledRimestagWatcher extends Watcher { Set s = playerMap.getOrDefault(playerId, null); return s != null && s.stream().anyMatch((UUID id) -> (id != creatureId)); } - - @Override - public SaddledRimestagWatcher copy() { - return new SaddledRimestagWatcher(this); - } } diff --git a/Mage.Sets/src/mage/cards/s/SevinneTheChronoclasm.java b/Mage.Sets/src/mage/cards/s/SevinneTheChronoclasm.java index 79b6f7f9184..55c53e53135 100644 --- a/Mage.Sets/src/mage/cards/s/SevinneTheChronoclasm.java +++ b/Mage.Sets/src/mage/cards/s/SevinneTheChronoclasm.java @@ -97,11 +97,6 @@ class SevinneTheChronoclasmWatcher extends Watcher { super(WatcherScope.GAME); } - private SevinneTheChronoclasmWatcher(final SevinneTheChronoclasmWatcher watcher) { - super(watcher); - this.firstSpellThisTurn.putAll(watcher.firstSpellThisTurn); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() != GameEvent.EventType.SPELL_CAST @@ -123,8 +118,4 @@ class SevinneTheChronoclasmWatcher extends Watcher { return targetId != null && targetId.equals(firstSpellThisTurn.getOrDefault(playerId, null)); } - @Override - public Watcher copy() { - return new SevinneTheChronoclasmWatcher(this); - } } diff --git a/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java b/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java index d155991c42b..dfe6278b0ac 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java @@ -78,16 +78,6 @@ class SilumgarScavengerExploitedWatcher extends Watcher { super(WatcherScope.GAME); } - private SilumgarScavengerExploitedWatcher(final SilumgarScavengerExploitedWatcher watcher) { - super(watcher); - this.exploitedPermanents.putAll(watcher.exploitedPermanents); - } - - @Override - public SilumgarScavengerExploitedWatcher copy() { - return new SilumgarScavengerExploitedWatcher(this); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.EXPLOITED_CREATURE) { diff --git a/Mage.Sets/src/mage/cards/v/VeilOfSummer.java b/Mage.Sets/src/mage/cards/v/VeilOfSummer.java index 4e97295d8ad..c6a5284ff5e 100644 --- a/Mage.Sets/src/mage/cards/v/VeilOfSummer.java +++ b/Mage.Sets/src/mage/cards/v/VeilOfSummer.java @@ -75,16 +75,6 @@ class VeilOfSummerWatcher extends Watcher { super(WatcherScope.GAME); } - private VeilOfSummerWatcher(final VeilOfSummerWatcher watcher) { - super(watcher); - this.opponentsCastBlueBlackSpell.addAll(watcher.opponentsCastBlueBlackSpell); - } - - @Override - public VeilOfSummerWatcher copy() { - return new VeilOfSummerWatcher(this); - } - @Override public void watch(GameEvent event, Game game) { if (GameEvent.EventType.SPELL_CAST == event.getType()) { diff --git a/Mage.Sets/src/mage/cards/v/VengefulWarchief.java b/Mage.Sets/src/mage/cards/v/VengefulWarchief.java index bec090c9249..611f1324a25 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulWarchief.java +++ b/Mage.Sets/src/mage/cards/v/VengefulWarchief.java @@ -88,11 +88,6 @@ class VengefulWarchiefWatcher extends Watcher { super(WatcherScope.GAME); } - private VengefulWarchiefWatcher(final VengefulWarchiefWatcher watcher) { - super(watcher); - this.playersLostLife.putAll(watcher.playersLostLife); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.LOST_LIFE) { @@ -102,11 +97,6 @@ class VengefulWarchiefWatcher extends Watcher { } } - @Override - public VengefulWarchiefWatcher copy() { - return new VengefulWarchiefWatcher(this); - } - @Override public void reset() { super.reset(); diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinDecoy.java b/Mage.Sets/src/mage/cards/z/ZhalfirinDecoy.java index 79e8507767b..0087d44cc71 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinDecoy.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinDecoy.java @@ -76,11 +76,6 @@ class ZhalfirinDecoyWatcher extends Watcher { super(WatcherScope.GAME); } - private ZhalfirinDecoyWatcher(final ZhalfirinDecoyWatcher watcher) { - super(watcher); - this.players.addAll(watcher.players); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE) { @@ -101,8 +96,4 @@ class ZhalfirinDecoyWatcher extends Watcher { return players.contains(playerId); } - @Override - public ZhalfirinDecoyWatcher copy() { - return new ZhalfirinDecoyWatcher(this); - } } diff --git a/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java index 63d138593d7..c865d22a31a 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java @@ -21,11 +21,6 @@ public class CardsDrawnThisTurnWatcher extends Watcher { super(WatcherScope.GAME); } - private CardsDrawnThisTurnWatcher(final CardsDrawnThisTurnWatcher watcher) { - super(watcher); - this.cardsDrawnThisTurn.putAll(watcher.cardsDrawnThisTurn); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.DREW_CARD) { @@ -44,9 +39,4 @@ public class CardsDrawnThisTurnWatcher extends Watcher { cardsDrawnThisTurn.clear(); } - - @Override - public CardsDrawnThisTurnWatcher copy() { - return new CardsDrawnThisTurnWatcher(this); - } } diff --git a/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java b/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java index d354aadb44e..e8a093451ab 100644 --- a/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java @@ -26,16 +26,6 @@ public class CommanderPlaysCountWatcher extends Watcher { super(WatcherScope.GAME); } - public CommanderPlaysCountWatcher(final CommanderPlaysCountWatcher watcher) { - super(watcher); - this.playsCount.putAll(watcher.playsCount); - } - - @Override - public CommanderPlaysCountWatcher copy() { - return new CommanderPlaysCountWatcher(this); - } - @Override public void watch(GameEvent event, Game game) { if (event.getType() != EventType.LAND_PLAYED && event.getType() != EventType.SPELL_CAST) {