From 3aeb5165b7c00a66819912b6c9e9dcf9fa33d028 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Thu, 16 May 2024 15:52:01 -0400 Subject: [PATCH] refactor: remove redundant class --- Mage.Sets/src/mage/cards/d/DeepSeaTerror.java | 10 ++--- .../src/mage/cards/m/MedomaiTheAgeless.java | 14 +++---- .../CantAttackAnyPlayerSourceEffect.java | 39 ------------------- 3 files changed, 10 insertions(+), 53 deletions(-) delete mode 100644 Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java b/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java index 2ce17ada09f..fad6139c7f5 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java @@ -1,21 +1,21 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.combat.CantAttackAnyPlayerSourceEffect; +import mage.abilities.effects.common.combat.CantAttackSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -30,7 +30,7 @@ public final class DeepSeaTerror extends CardImpl { // Deep-Sea Terror can't attack unless there are seven or more cards in your graveyard. Effect effect = new ConditionalRestrictionEffect( - new CantAttackAnyPlayerSourceEffect(Duration.WhileOnBattlefield), + new CantAttackSourceEffect(Duration.WhileOnBattlefield), new InvertCondition(new CardsInControllerGraveyardCondition(7))); effect.setText("{this} can't attack unless there are seven or more cards in your graveyard"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java index 5aba319ed36..208ce35dfe3 100644 --- a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java +++ b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -9,18 +7,16 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.combat.CantAttackAnyPlayerSourceEffect; +import mage.abilities.effects.common.combat.CantAttackSourceEffect; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; +import java.util.UUID; + /** * * @author LevelX2 @@ -40,7 +36,7 @@ public final class MedomaiTheAgeless extends CardImpl { // Whenever Medomai the Ageless deals combat damage to a player, take an extra turn after this one. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddExtraTurnControllerEffect(), false)); // Medomai the Ageless can't attack during extra turns. - Effect effect = new ConditionalRestrictionEffect(new CantAttackAnyPlayerSourceEffect(Duration.WhileOnBattlefield), ExtraTurnCondition.instance); + Effect effect = new ConditionalRestrictionEffect(new CantAttackSourceEffect(Duration.WhileOnBattlefield), ExtraTurnCondition.instance); effect.setText("{this} can't attack during extra turns"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java deleted file mode 100644 index 5021210a4aa..00000000000 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java +++ /dev/null @@ -1,39 +0,0 @@ -package mage.abilities.effects.common.combat; - -import mage.abilities.Ability; -import mage.abilities.effects.RestrictionEffect; -import mage.constants.Duration; -import mage.game.Game; -import mage.game.permanent.Permanent; - -/** - * The source of this effect can't attack any opponent - * - * @author BetaSteward_at_googlemail.com - */ -public class CantAttackAnyPlayerSourceEffect extends RestrictionEffect { - - public CantAttackAnyPlayerSourceEffect(Duration duration) { - super(duration); - } - - protected CantAttackAnyPlayerSourceEffect(final CantAttackAnyPlayerSourceEffect effect) { - super(effect); - } - - @Override - public boolean applies(Permanent permanent, Ability source, Game game) { - return permanent.getId().equals(source.getSourceId()); - } - - @Override - public boolean canAttack(Game game, boolean canUseChooseDialogs) { - return false; - } - - @Override - public CantAttackAnyPlayerSourceEffect copy() { - return new CantAttackAnyPlayerSourceEffect(this); - } - -}