diff --git a/Mage.Sets/src/mage/cards/g/GazeOfTheGorgon.java b/Mage.Sets/src/mage/cards/g/GazeOfTheGorgon.java index 46e0b6b89dc..9be46742dda 100644 --- a/Mage.Sets/src/mage/cards/g/GazeOfTheGorgon.java +++ b/Mage.Sets/src/mage/cards/g/GazeOfTheGorgon.java @@ -34,7 +34,6 @@ public final class GazeOfTheGorgon extends CardImpl { this.getSpellAbility().addEffect(new RegenerateTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GazeOfTheGorgonCreateDelayedTriggeredAbilityEffect()); - this.getSpellAbility().addWatcher(new BlockedAttackerWatcher()); } private GazeOfTheGorgon(final GazeOfTheGorgon card) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java index 36c5488469e..662792deb71 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java @@ -46,7 +46,6 @@ public final class GlyphOfDelusion extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addTarget(new GlyphOfDelusionSecondTarget()); this.getSpellAbility().addEffect(new GlyphOfDelusionEffect()); - this.getSpellAbility().addWatcher(new BlockedAttackerWatcher()); } private GlyphOfDelusion(final GlyphOfDelusion card) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java b/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java index 11a62663b1a..9e56f02fdb0 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java @@ -41,7 +41,6 @@ public final class GlyphOfDoom extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new InfoEffect("Choose target Wall creature")); this.getSpellAbility().addEffect(new GlyphOfDoomCreateDelayedTriggeredAbilityEffect()); - this.getSpellAbility().addWatcher(new BlockedAttackerWatcher()); } private GlyphOfDoom(final GlyphOfDoom card) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java index cb88460d5df..001099ec81a 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java @@ -48,7 +48,6 @@ public final class GlyphOfReincarnation extends CardImpl { // Destroy all creatures that were blocked by target Wall this turn. They can’t be regenerated. For each creature that died this way, put a creature card from the graveyard of the player who controlled that creature the last time it became blocked by that Wall onto the battlefield under its owner’s control. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new GlyphOfReincarnationEffect()); - this.getSpellAbility().addWatcher(new BlockedAttackerWatcher()); } private GlyphOfReincarnation(final GlyphOfReincarnation card) { diff --git a/Mage.Sets/src/mage/cards/h/HuntDown.java b/Mage.Sets/src/mage/cards/h/HuntDown.java index 2819e73e7cb..cd809a01829 100644 --- a/Mage.Sets/src/mage/cards/h/HuntDown.java +++ b/Mage.Sets/src/mage/cards/h/HuntDown.java @@ -33,7 +33,6 @@ public final class HuntDown extends CardImpl { this.getSpellAbility().addEffect(new HuntDownEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filterMustBlock)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filterToBeBlocked)); - this.getSpellAbility().addWatcher(new BlockedAttackerWatcher()); } diff --git a/Mage.Sets/src/mage/cards/j/JovensFerrets.java b/Mage.Sets/src/mage/cards/j/JovensFerrets.java index 8e8487f4126..75aae34fff4 100644 --- a/Mage.Sets/src/mage/cards/j/JovensFerrets.java +++ b/Mage.Sets/src/mage/cards/j/JovensFerrets.java @@ -45,7 +45,6 @@ public final class JovensFerrets extends CardImpl { // At end of combat, tap all creatures that blocked Joven's Ferrets this turn. They don't untap during their controller's next untap step. Ability eocAbility = new EndOfCombatTriggeredAbility(new JovensFerretsEffect(), false); - eocAbility.addWatcher(new BlockedAttackerWatcher()); this.addAbility(eocAbility); } @@ -101,4 +100,4 @@ class JovensFerretsEffect extends OneShotEffect { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MonstrousStep.java b/Mage.Sets/src/mage/cards/m/MonstrousStep.java index dde0308f408..a098f12aeb0 100644 --- a/Mage.Sets/src/mage/cards/m/MonstrousStep.java +++ b/Mage.Sets/src/mage/cards/m/MonstrousStep.java @@ -38,7 +38,6 @@ public final class MonstrousStep extends CardImpl { // Target creature gets +7/+7 until end of turn. Up to one target creature blocks it this turn if able. this.getSpellAbility().addEffect(new BoostTargetEffect(7, 7)); this.getSpellAbility().addEffect(new MonstrousStepEffect()); - this.getSpellAbility().addWatcher(new BlockedAttackerWatcher()); TargetPermanent target = new TargetCreaturePermanent(); target.setTargetTag(1); diff --git a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java index c323906e939..e38b87c36e8 100644 --- a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java +++ b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java @@ -55,7 +55,7 @@ public final class RimehornAurochs extends CardImpl { Ability ability = new SimpleActivatedAbility(new RimehornAurochsEffect(), new ManaCostsImpl<>("{2}{S}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature that must block"))); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature that is to be blocked"))); - this.addAbility(ability, new BlockedAttackerWatcher()); + this.addAbility(ability); } private RimehornAurochs(final RimehornAurochs card) { diff --git a/Mage.Sets/src/mage/cards/v/VenomousBreath.java b/Mage.Sets/src/mage/cards/v/VenomousBreath.java index 71b557587fd..a1dee0dc5fe 100644 --- a/Mage.Sets/src/mage/cards/v/VenomousBreath.java +++ b/Mage.Sets/src/mage/cards/v/VenomousBreath.java @@ -33,7 +33,6 @@ public final class VenomousBreath extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new InfoEffect("Choose target creature")); this.getSpellAbility().addEffect(new VenomousBreathCreateDelayedTriggeredAbilityEffect()); - this.getSpellAbility().addWatcher(new BlockedAttackerWatcher()); } private VenomousBreath(final VenomousBreath card) { diff --git a/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java b/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java index bfa3a48d237..1ceae3d0172 100644 --- a/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java @@ -1,4 +1,3 @@ - package mage.watchers.common; import java.util.HashMap; @@ -9,7 +8,6 @@ import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.watchers.Watcher; @@ -21,6 +19,9 @@ public class BlockedAttackerWatcher extends Watcher { private final Map> blockData = new HashMap<>(); + /** + * Game default watcher + */ public BlockedAttackerWatcher() { super(WatcherScope.GAME); }