diff --git a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java index 8e23848bfc6..86851a11d9e 100644 --- a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java +++ b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java @@ -1,7 +1,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -18,6 +17,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -37,7 +38,7 @@ public final class BogbrewWitch extends CardImpl { this.toughness = new MageInt(3); // {2}, {T}: Search your library for a card named Festering Newt or Bubbling Cauldron, put it onto the battlefield tapped, then shuffle your library. - TargetCardInLibrary target = new TargetCardInLibrary(1, 1, new FilterCard(filter)); + TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{2}")); diff --git a/Mage.Sets/src/mage/cards/g/GuidedPassage.java b/Mage.Sets/src/mage/cards/g/GuidedPassage.java index 710b931be59..b94dc3f2750 100644 --- a/Mage.Sets/src/mage/cards/g/GuidedPassage.java +++ b/Mage.Sets/src/mage/cards/g/GuidedPassage.java @@ -1,15 +1,9 @@ package mage.cards.g; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -22,6 +16,9 @@ import mage.target.Target; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.Set; +import java.util.UUID; + /** * * @author TheElk801 @@ -95,7 +92,7 @@ class GuidedPassageEffect extends OneShotEffect { } TargetCard target1 = new TargetCard(1, Zone.LIBRARY, StaticFilters.FILTER_CARD_CREATURE); TargetCard target2 = new TargetCard(1, Zone.LIBRARY, StaticFilters.FILTER_CARD_LAND); - TargetCard target3 = new TargetCard(1, Zone.LIBRARY, new FilterCard(filter)); + TargetCard target3 = new TargetCard(1, Zone.LIBRARY, filter); opponent.chooseTarget(Outcome.Detriment, cards, target1, source, game); opponent.chooseTarget(Outcome.Detriment, cards, target2, source, game); opponent.chooseTarget(Outcome.Detriment, cards, target3, source, game); diff --git a/Mage.Sets/src/mage/cards/l/LostHours.java b/Mage.Sets/src/mage/cards/l/LostHours.java index 172b1c5f543..886a2748477 100644 --- a/Mage.Sets/src/mage/cards/l/LostHours.java +++ b/Mage.Sets/src/mage/cards/l/LostHours.java @@ -1,7 +1,6 @@ package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -10,13 +9,14 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; -import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author L_J @@ -64,7 +64,7 @@ class LostHoursEffect extends OneShotEffect { if (targetPlayer != null && controller != null) { targetPlayer.revealCards(source, targetPlayer.getHand(), game); if (targetPlayer.getHand().size() > 0) { - TargetCard target = new TargetCard(Zone.HAND, new FilterCard(StaticFilters.FILTER_CARD_A_NON_LAND)); + TargetCard target = new TargetCard(Zone.HAND, StaticFilters.FILTER_CARD_A_NON_LAND); if (controller.choose(Outcome.Discard, targetPlayer.getHand(), target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/r/Repercussion.java b/Mage.Sets/src/mage/cards/r/Repercussion.java index 38372a6d030..16d073cc375 100644 --- a/Mage.Sets/src/mage/cards/r/Repercussion.java +++ b/Mage.Sets/src/mage/cards/r/Repercussion.java @@ -2,7 +2,6 @@ package mage.cards.r; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -49,7 +48,7 @@ class RepercussionTriggeredAbility extends TriggeredAbilityImpl { super(Zone.BATTLEFIELD, effect); } - public RepercussionTriggeredAbility(final RepercussionTriggeredAbility ability) { + private RepercussionTriggeredAbility(final RepercussionTriggeredAbility ability) { super(ability); } @@ -75,7 +74,7 @@ class RepercussionTriggeredAbility extends TriggeredAbilityImpl { } @Override - public TriggeredAbility copy() { + public RepercussionTriggeredAbility copy() { return new RepercussionTriggeredAbility(this); } } diff --git a/Mage.Sets/src/mage/cards/v/VileManifestation.java b/Mage.Sets/src/mage/cards/v/VileManifestation.java index 3d70f29c7bc..754ba504731 100644 --- a/Mage.Sets/src/mage/cards/v/VileManifestation.java +++ b/Mage.Sets/src/mage/cards/v/VileManifestation.java @@ -1,6 +1,5 @@ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -15,12 +14,14 @@ import mage.abilities.keyword.CyclingAbility; 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 mage.filter.FilterCard; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author spjspj @@ -43,7 +44,7 @@ public final class VileManifestation extends CardImpl { this.toughness = new MageInt(4); // Vile Manifestation gets +1/+0 for each card with cycling in your graveyard. - DynamicValue amount = new CardsInControllerGraveyardCount(new FilterCard(filter)); + DynamicValue amount = new CardsInControllerGraveyardCount(filter); Effect effect = new BoostSourceEffect(amount, StaticValue.get(0), Duration.WhileOnBattlefield); effect.setText("Vile Manifestation gets +1/+0 for each card with cycling in your graveyard."); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); diff --git a/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java b/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java index 09f92fd5e21..1db1781e8f3 100644 --- a/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java +++ b/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java @@ -1,7 +1,6 @@ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -11,14 +10,16 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; 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 mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,32 +55,32 @@ class CardsInOpponentGraveyardsCount implements DynamicValue { private FilterCard filter; public CardsInOpponentGraveyardsCount() { - this(new FilterCard()); + this(new FilterCard()); } public CardsInOpponentGraveyardsCount(FilterCard filter) { - this.filter = filter; + this.filter = filter; } - private CardsInOpponentGraveyardsCount(CardsInOpponentGraveyardsCount dynamicValue) { - this.filter = dynamicValue.filter; + private CardsInOpponentGraveyardsCount(final CardsInOpponentGraveyardsCount dynamicValue) { + this.filter = dynamicValue.filter; } @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { - int amount = 0; - for (UUID playerUUID : game.getOpponents(sourceAbility.getControllerId())) { - Player player = game.getPlayer(playerUUID); - if (player != null) { - amount += player.getGraveyard().count(filter, sourceAbility.getControllerId(), sourceAbility, game); - } + int amount = 0; + for (UUID playerUUID : game.getOpponents(sourceAbility.getControllerId())) { + Player player = game.getPlayer(playerUUID); + if (player != null) { + amount += player.getGraveyard().count(filter, sourceAbility.getControllerId(), sourceAbility, game); + } } return amount; } @Override - public DynamicValue copy() { - return new CardsInOpponentGraveyardsCount(this); + public CardsInOpponentGraveyardsCount copy() { + return new CardsInOpponentGraveyardsCount(this); } @Override diff --git a/Mage/src/main/java/mage/abilities/LoyaltyAbility.java b/Mage/src/main/java/mage/abilities/LoyaltyAbility.java index c0930d7ae83..7210c3d8a8b 100644 --- a/Mage/src/main/java/mage/abilities/LoyaltyAbility.java +++ b/Mage/src/main/java/mage/abilities/LoyaltyAbility.java @@ -33,7 +33,7 @@ public class LoyaltyAbility extends ActivatedAbilityImpl { this.timing = TimingRule.SORCERY; } - public LoyaltyAbility(LoyaltyAbility ability) { + protected LoyaltyAbility(final LoyaltyAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/PlayLandAbility.java b/Mage/src/main/java/mage/abilities/PlayLandAbility.java index 750ba6dc543..8ad0044caca 100644 --- a/Mage/src/main/java/mage/abilities/PlayLandAbility.java +++ b/Mage/src/main/java/mage/abilities/PlayLandAbility.java @@ -19,7 +19,7 @@ public class PlayLandAbility extends ActivatedAbilityImpl { this.name = "Play " + cardName; } - public PlayLandAbility(PlayLandAbility ability) { + protected PlayLandAbility(final PlayLandAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/StaticAbility.java b/Mage/src/main/java/mage/abilities/StaticAbility.java index c8788ad4c09..71ff35ca21f 100644 --- a/Mage/src/main/java/mage/abilities/StaticAbility.java +++ b/Mage/src/main/java/mage/abilities/StaticAbility.java @@ -36,7 +36,7 @@ public abstract class StaticAbility extends AbilityImpl { return super.isInUseableZone(game, source, event); } - public StaticAbility(StaticAbility ability) { + protected StaticAbility(final StaticAbility ability) { super(ability); } } diff --git a/Mage/src/main/java/mage/abilities/abilityword/StriveAbility.java b/Mage/src/main/java/mage/abilities/abilityword/StriveAbility.java index 71b498d26a9..f6a8f836839 100644 --- a/Mage/src/main/java/mage/abilities/abilityword/StriveAbility.java +++ b/Mage/src/main/java/mage/abilities/abilityword/StriveAbility.java @@ -31,7 +31,7 @@ public class StriveAbility extends SimpleStaticAbility { } @Override - public SimpleStaticAbility copy() { + public StriveAbility copy() { return new StriveAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java index 37697a4675a..35243e7218f 100644 --- a/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java @@ -19,7 +19,7 @@ public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl { this.condition = condition; } - public ActivateIfConditionActivatedAbility(ActivateIfConditionActivatedAbility ability) { + protected ActivateIfConditionActivatedAbility(final ActivateIfConditionActivatedAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/common/AttacksEachCombatStaticAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksEachCombatStaticAbility.java index eba1a419f86..e8e8f23ddbf 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksEachCombatStaticAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksEachCombatStaticAbility.java @@ -15,7 +15,7 @@ public class AttacksEachCombatStaticAbility extends StaticAbility { super(Zone.BATTLEFIELD, new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true)); } - public AttacksEachCombatStaticAbility(AttacksEachCombatStaticAbility ability) { + protected AttacksEachCombatStaticAbility(AttacksEachCombatStaticAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java index 958934236b1..eb33922e871 100644 --- a/Mage/src/main/java/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java @@ -28,7 +28,7 @@ public class DiesThisOrAnotherCreatureTriggeredAbility extends TriggeredAbilityI setTriggerPhrase("Whenever {this} or another " + filter.getMessage() + " dies, "); } - public DiesThisOrAnotherCreatureTriggeredAbility(DiesThisOrAnotherCreatureTriggeredAbility ability) { + protected DiesThisOrAnotherCreatureTriggeredAbility(final DiesThisOrAnotherCreatureTriggeredAbility ability) { super(ability); this.filter = ability.filter; this.applyFilterOnSource = ability.applyFilterOnSource; diff --git a/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java b/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java index f7ee00c554f..f80321ccfbc 100644 --- a/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java +++ b/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java @@ -36,7 +36,7 @@ public class PutIntoGraveFromAnywhereSourceAbility extends SimpleStaticAbility { } @Override - public SimpleStaticAbility copy() { + public PutIntoGraveFromAnywhereSourceAbility copy() { return new PutIntoGraveFromAnywhereSourceAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/common/SimpleEvasionAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleEvasionAbility.java index 22961492d7f..2eb1033f1ba 100644 --- a/Mage/src/main/java/mage/abilities/common/SimpleEvasionAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SimpleEvasionAbility.java @@ -20,7 +20,7 @@ public class SimpleEvasionAbility extends EvasionAbility { } } - public SimpleEvasionAbility(SimpleEvasionAbility ability) { + protected SimpleEvasionAbility(final SimpleEvasionAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/common/SimpleStaticAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleStaticAbility.java index b71bf85dae7..785e48f45d1 100644 --- a/Mage/src/main/java/mage/abilities/common/SimpleStaticAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SimpleStaticAbility.java @@ -19,7 +19,7 @@ public class SimpleStaticAbility extends StaticAbility { super(zone, effect); } - public SimpleStaticAbility(SimpleStaticAbility ability) { + protected SimpleStaticAbility(final SimpleStaticAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/costs/AlternativeCostImpl.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCostImpl.java index 81068b37e9f..1bccc0d6348 100644 --- a/Mage/src/main/java/mage/abilities/costs/AlternativeCostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/AlternativeCostImpl.java @@ -26,7 +26,7 @@ public class AlternativeCostImpl> extends Costs this.add(cost); } - public AlternativeCostImpl(final AlternativeCostImpl cost) { + protected AlternativeCostImpl(final AlternativeCostImpl cost) { super(cost); this.name = cost.name; this.reminderText = cost.reminderText; diff --git a/Mage/src/main/java/mage/abilities/costs/CostsImpl.java b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java index de1a5a0a526..01ab8e6545d 100644 --- a/Mage/src/main/java/mage/abilities/costs/CostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java @@ -21,7 +21,7 @@ public class CostsImpl extends ArrayList implements Costs public CostsImpl() { } - public CostsImpl(final CostsImpl costs) { + protected CostsImpl(final CostsImpl costs) { this.ensureCapacity(costs.size()); for (Cost cost : costs) { this.add((T) cost.copy()); @@ -167,7 +167,7 @@ public class CostsImpl extends ArrayList implements Costs } @Override - public Costs copy() { + public CostsImpl copy() { return new CostsImpl(this); } } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java index 359a3d1c2b9..cde1c26715c 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java @@ -45,6 +45,9 @@ public abstract class ManaCostImpl extends CostImpl implements ManaCost { this.phyrexian = manaCost.phyrexian; } + @Override + abstract public ManaCostImpl copy(); + @Override public Mana getPayment() { return payment; diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java index d5a13f3e1e4..7c56ecd9381 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java @@ -608,7 +608,7 @@ public class ManaCostsImpl extends ArrayList implements M } @Override - public ManaCosts copy() { + public ManaCostsImpl copy() { return new ManaCostsImpl<>(this); } diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java index f3cd39c4e6c..eab591fb5eb 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java @@ -39,7 +39,7 @@ public class ConditionalOneShotEffect extends OneShotEffect { this.staticText = text; } - public ConditionalOneShotEffect(ConditionalOneShotEffect effect) { + protected ConditionalOneShotEffect(final ConditionalOneShotEffect effect) { super(effect); this.effects.addAll(effect.effects.copy()); this.otherwiseEffects.addAll(effect.otherwiseEffects.copy()); diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java index bd488c7cf5a..5c30bdeae8e 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java @@ -1,11 +1,12 @@ package mage.abilities.dynamicvalue; +import mage.abilities.Ability; +import mage.abilities.effects.Effect; +import mage.game.Game; + import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import mage.abilities.Ability; -import mage.abilities.effects.Effect; -import mage.game.Game; public class AdditiveDynamicValue implements DynamicValue { @@ -37,7 +38,7 @@ public class AdditiveDynamicValue implements DynamicValue { } @Override - public DynamicValue copy() { + public AdditiveDynamicValue copy() { return new AdditiveDynamicValue(this.dynamicValues); } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestManaValueCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestManaValueCount.java index 9087be132ae..af92813ce48 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestManaValueCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestManaValueCount.java @@ -44,7 +44,7 @@ public class HighestManaValueCount implements DynamicValue { } @Override - public DynamicValue copy() { + public HighestManaValueCount copy() { return new HighestManaValueCount(this); } diff --git a/Mage/src/main/java/mage/abilities/effects/SearchEffect.java b/Mage/src/main/java/mage/abilities/effects/SearchEffect.java index 1b234d8fe6e..b00ce8bba6e 100644 --- a/Mage/src/main/java/mage/abilities/effects/SearchEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/SearchEffect.java @@ -19,7 +19,7 @@ public abstract class SearchEffect extends OneShotEffect { this.target = target; } - public SearchEffect(SearchEffect effect) { + protected SearchEffect(final SearchEffect effect) { super(effect); this.target = effect.target.copy(); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java index fface948f97..b5c279e4a7c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java @@ -25,7 +25,7 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect { : text + " skips their next untap step"; } - public SkipNextPlayerUntapStepEffect(SkipNextPlayerUntapStepEffect effect) { + protected SkipNextPlayerUntapStepEffect(final SkipNextPlayerUntapStepEffect effect) { super(effect); } diff --git a/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java b/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java index 21b46820d84..d5e5d5b203a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java @@ -23,7 +23,7 @@ public class AffinityForArtifactsAbility extends SimpleStaticAbility { } @Override - public SimpleStaticAbility copy() { + public AffinityForArtifactsAbility copy() { return new AffinityForArtifactsAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java b/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java index 4842e688fd9..cc63bd9249d 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java @@ -31,7 +31,7 @@ public class AffinityForLandTypeAbility extends SimpleStaticAbility { } @Override - public SimpleStaticAbility copy() { + public AffinityForLandTypeAbility copy() { return new AffinityForLandTypeAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java index 964a7114913..8b3a527e958 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java @@ -1,9 +1,5 @@ package mage.abilities.keyword; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; @@ -15,6 +11,10 @@ import mage.players.Player; import mage.util.CardUtil; import mage.watchers.common.BloodthirstWatcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * @author Loki */ @@ -33,7 +33,7 @@ public class BloodthirstAbility extends EntersBattlefieldAbility { } @Override - public EntersBattlefieldAbility copy() { + public BloodthirstAbility copy() { return new BloodthirstAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java b/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java index ab31a74849c..6cbb2b88141 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java @@ -39,7 +39,7 @@ public class CumulativeUpkeepAbility extends BeginningOfUpkeepTriggeredAbility { } @Override - public BeginningOfUpkeepTriggeredAbility copy() { + public CumulativeUpkeepAbility copy() { return new CumulativeUpkeepAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java b/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java index 0ce0a51df63..38db09dc2a0 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EscalateAbility.java @@ -42,7 +42,7 @@ class EscalateEffect extends CostModificationEffectImpl { this.staticText = "Escalate " + cost.getText() + " (Pay this cost for each mode chosen beyond the first.)"; } - EscalateEffect(final EscalateEffect effect) { + private EscalateEffect(final EscalateEffect effect) { super(effect); this.cost = effect.cost.copy(); } diff --git a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java index a38b498b8da..db0a80aba3b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java @@ -1,9 +1,6 @@ package mage.abilities.keyword; -import java.util.HashSet; -import java.util.Set; - import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; @@ -23,6 +20,9 @@ import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; + /** * @author LevelX2 */ @@ -81,7 +81,7 @@ class ExertReplacementEffect extends ReplacementEffectImpl { this.exertOnlyOncePerTurn = exertOnlyOncePerTurn; } - public ExertReplacementEffect(ExertReplacementEffect effect) { + private ExertReplacementEffect(ExertReplacementEffect effect) { super(effect); this.exertOnlyOncePerTurn = effect.exertOnlyOncePerTurn; } diff --git a/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java index 728e431234e..139178b4b48 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java @@ -55,7 +55,7 @@ public class FadingAbility extends EntersBattlefieldAbility { } @Override - public EntersBattlefieldAbility copy() { + public FadingAbility copy() { return new FadingAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java index 91094bc762a..a475494c3ad 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java @@ -36,7 +36,7 @@ public class ReinforceAbility extends SimpleActivatedAbility { } @Override - public SimpleActivatedAbility copy() { + public ReinforceAbility copy() { return new ReinforceAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java index 361f1dc3c64..a4d72d2ee41 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java @@ -57,7 +57,7 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility { } @Override - public DiesSourceTriggeredAbility copy() { + public SoulshiftAbility copy() { return new SoulshiftAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/SpliceAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpliceAbility.java index f5bc3845d97..45823e8d7c9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpliceAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpliceAbility.java @@ -1,6 +1,5 @@ package mage.abilities.keyword; -import java.util.Iterator; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; @@ -19,6 +18,8 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; +import java.util.Iterator; + /** * 702.45. Splice * @@ -116,7 +117,7 @@ public class SpliceAbility extends SimpleStaticAbility { } @Override - public SimpleStaticAbility copy() { + public SpliceAbility copy() { return new SpliceAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java index 55e5823ea5a..de3a7c95e63 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java @@ -30,13 +30,13 @@ public class SplitSecondAbility extends SimpleStaticAbility { return "Split second (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.)"; } - public SplitSecondAbility(SplitSecondAbility ability) { + protected SplitSecondAbility(final SplitSecondAbility ability) { super(ability); } @Override - public SimpleStaticAbility copy() { - return new SplitSecondAbility(this); + public SplitSecondAbility copy() { + return new SplitSecondAbility(this); } } diff --git a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java index 4237f482429..d3a0f87fa83 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java @@ -37,7 +37,7 @@ public class SunburstAbility extends EntersBattlefieldAbility { } @Override - public EntersBattlefieldAbility copy() { + public SunburstAbility copy() { return new SunburstAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java index 2063054984c..ff3de87c56b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java @@ -31,7 +31,7 @@ public class TransformAbility extends SimpleStaticAbility { } @Override - public SimpleStaticAbility copy() { + public TransformAbility copy() { return new TransformAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java index fe8a1c01564..a1fbb0400ea 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java @@ -48,7 +48,7 @@ public class TransmuteAbility extends SimpleActivatedAbility { } @Override - public SimpleActivatedAbility copy() { + public TransmuteAbility copy() { return new TransmuteAbility(this); } @@ -67,7 +67,7 @@ class TransmuteEffect extends OneShotEffect { staticText = "Transmute"; } - TransmuteEffect(final TransmuteEffect effect) { + private TransmuteEffect(final TransmuteEffect effect) { super(effect); } diff --git a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java index 06bb04d158d..2375c171f17 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java @@ -1,8 +1,6 @@ package mage.abilities.keyword; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; @@ -15,6 +13,8 @@ import mage.target.Target; import mage.target.common.TargetOpponent; import mage.util.CardUtil; +import java.util.UUID; + /** * @author LevelX2 */ @@ -33,7 +33,7 @@ public class TributeAbility extends EntersBattlefieldAbility { } @Override - public EntersBattlefieldAbility copy() { + public TributeAbility copy() { return new TributeAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java b/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java index 7f352f72ac2..e05784e5189 100644 --- a/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/UndauntedAbility.java @@ -20,7 +20,7 @@ public class UndauntedAbility extends SimpleStaticAbility { } @Override - public SimpleStaticAbility copy() { + public UndauntedAbility copy() { return new UndauntedAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java index e2ac302a316..777b3340ad9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java @@ -27,7 +27,7 @@ public class UndyingAbility extends DiesSourceTriggeredAbility { } @Override - public DiesSourceTriggeredAbility copy() { + public UndyingAbility copy() { return new UndyingAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java b/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java index e6097184fb3..969ddd2e887 100644 --- a/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java @@ -34,7 +34,7 @@ public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility { } @Override - public BeginningOfUpkeepTriggeredAbility copy() { + public VanishingUpkeepAbility copy() { return new VanishingUpkeepAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java b/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java index e74ac006dfe..01e2a8cd5a7 100644 --- a/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java @@ -13,7 +13,7 @@ public abstract class BasicManaAbility extends ActivatedManaAbilityImpl { super(Zone.BATTLEFIELD, effect, new TapSourceCost()); } - public BasicManaAbility(BasicManaAbility ability) { + protected BasicManaAbility(final BasicManaAbility ability) { super(ability); } } diff --git a/Mage/src/main/java/mage/abilities/mana/BlackManaAbility.java b/Mage/src/main/java/mage/abilities/mana/BlackManaAbility.java index 3c7f2193163..93d08a9dd19 100644 --- a/Mage/src/main/java/mage/abilities/mana/BlackManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/BlackManaAbility.java @@ -17,7 +17,7 @@ public class BlackManaAbility extends BasicManaAbility { this.netMana.add(new Mana(ColoredManaSymbol.B)); } - public BlackManaAbility(BlackManaAbility ability) { + private BlackManaAbility(final BlackManaAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/mana/BlueManaAbility.java b/Mage/src/main/java/mage/abilities/mana/BlueManaAbility.java index 54569a99e73..d6dbbd1c01b 100644 --- a/Mage/src/main/java/mage/abilities/mana/BlueManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/BlueManaAbility.java @@ -17,7 +17,7 @@ public class BlueManaAbility extends BasicManaAbility { this.netMana.add(new Mana(ColoredManaSymbol.U)); } - public BlueManaAbility(BlueManaAbility ability) { + private BlueManaAbility(final BlueManaAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/mana/ColorlessManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ColorlessManaAbility.java index 344d56b9261..8398e8d7fe7 100644 --- a/Mage/src/main/java/mage/abilities/mana/ColorlessManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ColorlessManaAbility.java @@ -15,7 +15,7 @@ public class ColorlessManaAbility extends BasicManaAbility { this.netMana.add(Mana.ColorlessMana(1)); } - public ColorlessManaAbility(ColorlessManaAbility ability) { + private ColorlessManaAbility(final ColorlessManaAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/mana/GreenManaAbility.java b/Mage/src/main/java/mage/abilities/mana/GreenManaAbility.java index 2fc20ad4bd1..6f997240818 100644 --- a/Mage/src/main/java/mage/abilities/mana/GreenManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/GreenManaAbility.java @@ -17,7 +17,7 @@ public class GreenManaAbility extends BasicManaAbility { this.netMana.add(new Mana(ColoredManaSymbol.G)); } - public GreenManaAbility(GreenManaAbility ability) { + private GreenManaAbility(final GreenManaAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/mana/RedManaAbility.java b/Mage/src/main/java/mage/abilities/mana/RedManaAbility.java index 1dc02c75fc0..cce7adbcc29 100644 --- a/Mage/src/main/java/mage/abilities/mana/RedManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/RedManaAbility.java @@ -17,7 +17,7 @@ public class RedManaAbility extends BasicManaAbility { this.netMana.add(new Mana(ColoredManaSymbol.R)); } - public RedManaAbility(RedManaAbility ability) { + private RedManaAbility(final RedManaAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/mana/WhiteManaAbility.java b/Mage/src/main/java/mage/abilities/mana/WhiteManaAbility.java index 1d67c4b2227..8d80737800a 100644 --- a/Mage/src/main/java/mage/abilities/mana/WhiteManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/WhiteManaAbility.java @@ -17,7 +17,7 @@ public class WhiteManaAbility extends BasicManaAbility { this.netMana.add(new Mana(ColoredManaSymbol.W)); } - public WhiteManaAbility(WhiteManaAbility ability) { + private WhiteManaAbility(final WhiteManaAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/cards/AdventureCard.java b/Mage/src/main/java/mage/cards/AdventureCard.java index c35257b159b..875e1095233 100644 --- a/Mage/src/main/java/mage/cards/AdventureCard.java +++ b/Mage/src/main/java/mage/cards/AdventureCard.java @@ -30,7 +30,7 @@ public abstract class AdventureCard extends CardImpl { spellCard.finalizeAdventure(); } - public AdventureCard(AdventureCard card) { + protected AdventureCard(final AdventureCard card) { super(card); this.spellCard = card.getSpellCard().copy(); this.spellCard.setParentCard(this); diff --git a/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java b/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java index 47a01b819f6..414fe262aa7 100644 --- a/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java +++ b/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java @@ -83,7 +83,7 @@ public class AdventureCardSpellImpl extends CardImpl implements AdventureCardSpe } @Override - public AdventureCardSpell copy() { + public AdventureCardSpellImpl copy() { return new AdventureCardSpellImpl(this); } diff --git a/Mage/src/main/java/mage/cards/LevelerCard.java b/Mage/src/main/java/mage/cards/LevelerCard.java index a17ab793f95..bfd5f37709d 100644 --- a/Mage/src/main/java/mage/cards/LevelerCard.java +++ b/Mage/src/main/java/mage/cards/LevelerCard.java @@ -19,7 +19,7 @@ public abstract class LevelerCard extends CardImpl { super(ownerId, setInfo, cardTypes, costs); } - public LevelerCard(LevelerCard card) { + protected LevelerCard(final LevelerCard card) { super(card); this.maxLevelCounters = card.maxLevelCounters; } diff --git a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java index f1d309e4491..21b2f910ead 100644 --- a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java +++ b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java @@ -69,7 +69,7 @@ public class SplitCardHalfImpl extends CardImpl implements SplitCardHalf { } @Override - public SplitCardHalf copy() { + public SplitCardHalfImpl copy() { return new SplitCardHalfImpl(this); } diff --git a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java index 3a7923c3cab..3bd5c769d87 100644 --- a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java +++ b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java @@ -1,15 +1,15 @@ package mage.cards.basiclands; -import java.util.UUID; - -import mage.cards.CardSetInfo; -import mage.constants.CardType; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; +import java.util.UUID; + /** * @author BetaSteward_at_googlemail.com */ @@ -22,7 +22,7 @@ public abstract class BasicLand extends CardImpl { this.addAbility(mana); } - public BasicLand(BasicLand land) { + protected BasicLand(final BasicLand land) { super(land); } diff --git a/Mage/src/main/java/mage/cards/basiclands/Forest.java b/Mage/src/main/java/mage/cards/basiclands/Forest.java index 4bdb249831c..f13573655d9 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Forest.java +++ b/Mage/src/main/java/mage/cards/basiclands/Forest.java @@ -2,13 +2,11 @@ package mage.cards.basiclands; -import java.util.UUID; - -import mage.ObjectColor; import mage.abilities.mana.GreenManaAbility; -import mage.cards.Card; import mage.cards.CardSetInfo; +import java.util.UUID; + /** * @author BetaSteward_at_googlemail.com */ @@ -18,12 +16,12 @@ public class Forest extends BasicLand { this.frameColor.setGreen(true); } - protected Forest(final Forest land) { + private Forest(final Forest land) { super(land); } @Override - public Card copy() { + public Forest copy() { return new Forest(this); } } diff --git a/Mage/src/main/java/mage/cards/basiclands/Island.java b/Mage/src/main/java/mage/cards/basiclands/Island.java index d0ecb8d8ec9..f0f76b8bd4f 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Island.java +++ b/Mage/src/main/java/mage/cards/basiclands/Island.java @@ -2,12 +2,11 @@ package mage.cards.basiclands; -import java.util.UUID; -import mage.ObjectColor; import mage.abilities.mana.BlueManaAbility; -import mage.cards.Card; import mage.cards.CardSetInfo; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -18,12 +17,12 @@ public class Island extends BasicLand { this.frameColor.setBlue(true); } - public Island(Island land) { + private Island(final Island land) { super(land); } @Override - public Card copy() { + public Island copy() { return new Island(this); } } diff --git a/Mage/src/main/java/mage/cards/basiclands/Mountain.java b/Mage/src/main/java/mage/cards/basiclands/Mountain.java index e16c4ac34aa..4c16d19ea74 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Mountain.java +++ b/Mage/src/main/java/mage/cards/basiclands/Mountain.java @@ -2,12 +2,11 @@ package mage.cards.basiclands; -import java.util.UUID; -import mage.ObjectColor; import mage.abilities.mana.RedManaAbility; -import mage.cards.Card; import mage.cards.CardSetInfo; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -18,12 +17,12 @@ public class Mountain extends BasicLand { this.frameColor.setRed(true); } - public Mountain(Mountain land) { + private Mountain(final Mountain land) { super(land); } @Override - public Card copy() { + public Mountain copy() { return new Mountain(this); } } diff --git a/Mage/src/main/java/mage/cards/basiclands/Plains.java b/Mage/src/main/java/mage/cards/basiclands/Plains.java index 4f4151e71bd..7a7d46408fb 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Plains.java +++ b/Mage/src/main/java/mage/cards/basiclands/Plains.java @@ -2,12 +2,11 @@ package mage.cards.basiclands; -import java.util.UUID; -import mage.ObjectColor; import mage.abilities.mana.WhiteManaAbility; -import mage.cards.Card; import mage.cards.CardSetInfo; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -18,12 +17,12 @@ public class Plains extends BasicLand { this.frameColor.setWhite(true); } - public Plains(Plains land) { + private Plains(final Plains land) { super(land); } @Override - public Card copy() { + public Plains copy() { return new Plains(this); } } diff --git a/Mage/src/main/java/mage/cards/basiclands/Swamp.java b/Mage/src/main/java/mage/cards/basiclands/Swamp.java index 5e866c99d6b..82c212263b7 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Swamp.java +++ b/Mage/src/main/java/mage/cards/basiclands/Swamp.java @@ -2,12 +2,11 @@ package mage.cards.basiclands; -import java.util.UUID; -import mage.ObjectColor; import mage.abilities.mana.BlackManaAbility; -import mage.cards.Card; import mage.cards.CardSetInfo; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -18,12 +17,12 @@ public class Swamp extends BasicLand { this.frameColor.setBlack(true); } - public Swamp(Swamp land) { + private Swamp(final Swamp land) { super(land); } @Override - public Card copy() { + public Swamp copy() { return new Swamp(this); } } diff --git a/Mage/src/main/java/mage/filter/FilterAbility.java b/Mage/src/main/java/mage/filter/FilterAbility.java index eaedf47903b..887d3b3eb65 100644 --- a/Mage/src/main/java/mage/filter/FilterAbility.java +++ b/Mage/src/main/java/mage/filter/FilterAbility.java @@ -21,7 +21,7 @@ public class FilterAbility extends FilterImpl { super(name); } - public FilterAbility(FilterAbility filter) { + protected FilterAbility(final FilterAbility filter) { super(filter); } diff --git a/Mage/src/main/java/mage/filter/FilterCard.java b/Mage/src/main/java/mage/filter/FilterCard.java index 0718eb2d682..d9b2f18d142 100644 --- a/Mage/src/main/java/mage/filter/FilterCard.java +++ b/Mage/src/main/java/mage/filter/FilterCard.java @@ -34,7 +34,7 @@ public class FilterCard extends FilterObject { super(name); } - public FilterCard(FilterCard filter) { + protected FilterCard(final FilterCard filter) { super(filter); this.extraPredicates.addAll(filter.extraPredicates); } diff --git a/Mage/src/main/java/mage/filter/FilterImpl.java b/Mage/src/main/java/mage/filter/FilterImpl.java index f7e9fe68aed..428610eabbb 100644 --- a/Mage/src/main/java/mage/filter/FilterImpl.java +++ b/Mage/src/main/java/mage/filter/FilterImpl.java @@ -26,7 +26,7 @@ public abstract class FilterImpl implements Filter { this.lockedFilter = false; } - public FilterImpl(final FilterImpl filter) { + protected FilterImpl(final FilterImpl filter) { this.message = filter.message; this.predicates = new ArrayList<>(filter.predicates); this.lockedFilter = false;// After copying a filter it's allowed to modify diff --git a/Mage/src/main/java/mage/filter/FilterObject.java b/Mage/src/main/java/mage/filter/FilterObject.java index e752f5bce7f..6795d65b76d 100644 --- a/Mage/src/main/java/mage/filter/FilterObject.java +++ b/Mage/src/main/java/mage/filter/FilterObject.java @@ -24,7 +24,7 @@ public class FilterObject extends FilterImpl { super(name); } - public FilterObject(FilterObject filter) { + protected FilterObject(final FilterObject filter) { super(filter); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index b68d9908524..bee3e8dadfa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -24,7 +24,7 @@ public final class WolfToken extends TokenImpl { } @Override - public Token copy() { + public WolfToken copy() { return new WolfToken(this); } } diff --git a/Mage/src/main/java/mage/target/targetpointer/NthTargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/NthTargetPointer.java index b1f0e4691c4..a4f2726e404 100644 --- a/Mage/src/main/java/mage/target/targetpointer/NthTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/NthTargetPointer.java @@ -26,7 +26,7 @@ public abstract class NthTargetPointer extends TargetPointerImpl { this.targetNumber = targetNumber; } - public NthTargetPointer(final NthTargetPointer nthTargetPointer) { + protected NthTargetPointer(final NthTargetPointer nthTargetPointer) { super(nthTargetPointer); this.targetNumber = nthTargetPointer.targetNumber;