From e2c7fdf121ecfe85ef295e343ad940afb5c096b2 Mon Sep 17 00:00:00 2001 From: North Date: Mon, 2 Jun 2014 22:30:01 +0300 Subject: [PATCH] [refactor] removed generic parameter from Cost --- .../src/mage/sets/alliances/ElvishSpiritGuide.java | 2 +- .../mage/sets/betrayersofkamigawa/BlindingPowder.java | 2 +- .../src/mage/sets/betrayersofkamigawa/Shuriken.java | 2 +- .../src/mage/sets/championsofkamigawa/Hankyu.java | 2 +- .../sets/championsofkamigawa/HisokaMinamoSensei.java | 2 +- .../src/mage/sets/commander/VishKalBloodArbiter.java | 2 +- .../mage/sets/commander2013/MarathWillOfTheWild.java | 2 +- .../src/mage/sets/darkascension/JarOfEyeballs.java | 2 +- Mage.Sets/src/mage/sets/darksteel/LeoninBola.java | 2 +- Mage.Sets/src/mage/sets/eventide/HatchetBully.java | 2 +- Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java | 2 +- .../src/mage/sets/innistrad/BackFromTheBrink.java | 2 +- Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java | 2 +- .../src/mage/sets/innistrad/SkirsdagHighPriest.java | 2 +- .../src/mage/sets/journeyintonyx/SageOfHours.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java | 2 +- Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java | 2 +- .../src/mage/sets/mercadianmasques/LandGrant.java | 2 +- .../src/mage/sets/mirage/PhyrexianDreadnought.java | 2 +- .../src/mage/sets/modernmasters/RiftElemental.java | 2 +- .../src/mage/sets/newphyrexia/GreenhiltTrainee.java | 2 +- .../src/mage/sets/planarchaos/SimianSpiritGuide.java | 2 +- .../mage/sets/returntoravnica/RakdosLordOfRiots.java | 2 +- .../src/mage/sets/saviorsofkamigawa/TombOfUrami.java | 2 +- .../mage/sets/scarsofmirrodin/BloodshotTrainee.java | 2 +- .../src/mage/sets/shadowmoor/LeechriddenSwamp.java | 2 +- Mage.Sets/src/mage/sets/tempest/EssenceBottle.java | 2 +- Mage.Sets/src/mage/sets/tempest/TortureChamber.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java | 2 +- Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java | 2 +- Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.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/worldwake/SlingbowTrap.java | 2 +- Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java | 2 +- Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/BlazingTorch.java | 2 +- Mage.Sets/src/mage/sets/zendikar/CobraTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.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/LethargyTrap.java | 2 +- .../src/mage/sets/zendikar/LuminarchAscension.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/RavenousTrap.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/costs/AlternativeCostImpl.java | 2 +- Mage/src/mage/abilities/costs/CostImpl.java | 5 +---- .../abilities/costs/OptionalAdditionalCostImpl.java | 2 +- Mage/src/mage/abilities/costs/VariableCostImpl.java | 6 +----- .../abilities/costs/common/ControlPermanentCost.java | 2 +- .../mage/abilities/costs/common/DiscardHandCost.java | 2 +- .../mage/abilities/costs/common/DiscardSourceCost.java | 2 +- .../mage/abilities/costs/common/DiscardTargetCost.java | 2 +- .../abilities/costs/common/DiscardXTargetCost.java | 2 +- .../abilities/costs/common/ExileFromGraveCost.java | 2 +- .../mage/abilities/costs/common/ExileFromHandCost.java | 2 +- .../abilities/costs/common/ExileFromStackCost.java | 2 +- .../mage/abilities/costs/common/ExileSourceCost.java | 2 +- .../costs/common/ExileSourceFromGraveCost.java | 2 +- .../costs/common/ExileXFromYourGraveCost.java | 2 +- .../abilities/costs/common/GainLifeOpponentCost.java | 2 +- .../abilities/costs/common/GainLifePlayersCost.java | 2 +- .../mage/abilities/costs/common/MetalcraftCost.java | 2 +- .../abilities/costs/common/OnlyDuringUpkeepCost.java | 2 +- Mage/src/mage/abilities/costs/common/PayLifeCost.java | 2 +- .../mage/abilities/costs/common/PayLoyaltyCost.java | 2 +- .../abilities/costs/common/PayVariableLifeCost.java | 2 +- .../abilities/costs/common/PayVariableLoyaltyCost.java | 2 +- .../abilities/costs/common/PutCountersSourceCost.java | 2 +- .../common/PutTopCardOfYourLibraryToGraveyardCost.java | 2 +- .../mage/abilities/costs/common/RemoveCounterCost.java | 2 +- .../costs/common/RemoveCountersSourceCost.java | 2 +- .../costs/common/RemoveVariableCountersSourceCost.java | 2 +- .../costs/common/RemoveVariableCountersTargetCost.java | 2 +- .../abilities/costs/common/ReturnToHandSourceCost.java | 2 +- .../abilities/costs/common/ReturnToHandTargetCost.java | 2 +- .../costs/common/RevealSourceFromYourHandCost.java | 2 +- .../costs/common/RevealTargetFromHandCost.java | 2 +- .../mage/abilities/costs/common/SacrificeAllCost.java | 2 +- .../abilities/costs/common/SacrificeSourceCost.java | 2 +- .../abilities/costs/common/SacrificeTargetCost.java | 2 +- .../abilities/costs/common/SacrificeXTargetCost.java | 2 +- .../src/mage/abilities/costs/common/TapSourceCost.java | 2 +- .../src/mage/abilities/costs/common/TapTargetCost.java | 2 +- .../abilities/costs/common/TapVariableTargetCost.java | 2 +- .../mage/abilities/costs/common/UntapSourceCost.java | 2 +- .../mage/abilities/costs/common/UntapTargetCost.java | 2 +- .../src/mage/abilities/costs/mana/ColoredManaCost.java | 2 +- .../src/mage/abilities/costs/mana/GenericManaCost.java | 2 +- Mage/src/mage/abilities/costs/mana/HybridManaCost.java | 2 +- Mage/src/mage/abilities/costs/mana/ManaCostImpl.java | 10 ++-------- .../mage/abilities/costs/mana/MonoHybridManaCost.java | 2 +- .../mage/abilities/costs/mana/VariableManaCost.java | 2 +- Mage/src/mage/abilities/keyword/ChampionAbility.java | 2 +- Mage/src/mage/abilities/keyword/NinjutsuAbility.java | 4 ++-- 103 files changed, 105 insertions(+), 118 deletions(-) diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java b/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java index 3e37d263bd6..d412f1695fa 100644 --- a/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java +++ b/Mage.Sets/src/mage/sets/alliances/ElvishSpiritGuide.java @@ -74,7 +74,7 @@ public class ElvishSpiritGuide extends CardImpl { } -class ExileSourceFromHandCost extends CostImpl { +class ExileSourceFromHandCost extends CostImpl { public ExileSourceFromHandCost() { this.text = "Exile {this} from your hand"; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlindingPowder.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlindingPowder.java index cf621d005f7..9bcc3777441 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlindingPowder.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlindingPowder.java @@ -77,7 +77,7 @@ public class BlindingPowder extends CardImpl { } } -class BlindingPowderUnattachCost extends CostImpl { +class BlindingPowderUnattachCost extends CostImpl { public BlindingPowderUnattachCost() { this.text = "Unattach Blinding Powder"; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java index 6080559e897..beaab6578c6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java @@ -124,7 +124,7 @@ class ShurikenDamageEffect extends OneShotEffect { } -class ShurikenUnattachCost extends CostImpl { +class ShurikenUnattachCost extends CostImpl { Permanent equipment; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java index 266972173d6..a6610f1d2cf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Hankyu.java @@ -160,7 +160,7 @@ class HankyuDealsDamageEffect extends OneShotEffect { } -class HankyuCountersSourceCost extends CostImpl { +class HankyuCountersSourceCost extends CostImpl { private int removedCounters; private UUID effectGivingEquipmentId; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java index bfdac85e9d9..561195f351b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java @@ -83,7 +83,7 @@ public class HisokaMinamoSensei extends CardImpl { } -class HisokaMinamoSenseiDiscardTargetCost extends CostImpl { +class HisokaMinamoSenseiDiscardTargetCost extends CostImpl { protected int convertedManaCosts = 0; diff --git a/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java b/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java index 3a27de90326..415c11cc8e6 100644 --- a/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java +++ b/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java @@ -98,7 +98,7 @@ public class VishKalBloodArbiter extends CardImpl { } } -class VishKalBloodArbiterCost extends CostImpl { +class VishKalBloodArbiterCost extends CostImpl { private int amount; private String name; diff --git a/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java b/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java index da37c7a1861..420dba175ee 100644 --- a/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java @@ -181,7 +181,7 @@ class MarathWillOfTheWildElementalToken extends Token { } } -class MarathWillOfTheWildRemoveCountersCost extends CostImpl { +class MarathWillOfTheWildRemoveCountersCost extends CostImpl { public MarathWillOfTheWildRemoveCountersCost() { this.text = "Remove X +1/+1 counters from Marath"; diff --git a/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java b/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java index 26baa109711..f8823d1c3ff 100644 --- a/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java +++ b/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java @@ -119,7 +119,7 @@ class JarOfEyeballsTriggeredAbility extends TriggeredAbilityImpl { } } -class JarOfEyeballsCost extends CostImpl { +class JarOfEyeballsCost extends CostImpl { private int removedCounters; diff --git a/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java b/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java index 9f05a47a232..ca4de4f1fab 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java +++ b/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java @@ -75,7 +75,7 @@ public class LeoninBola extends CardImpl { } } -class UnattachCost extends CostImpl { +class UnattachCost extends CostImpl { private UUID attachmentid; diff --git a/Mage.Sets/src/mage/sets/eventide/HatchetBully.java b/Mage.Sets/src/mage/sets/eventide/HatchetBully.java index 14f6de4c90a..f5bf78c2c06 100644 --- a/Mage.Sets/src/mage/sets/eventide/HatchetBully.java +++ b/Mage.Sets/src/mage/sets/eventide/HatchetBully.java @@ -86,7 +86,7 @@ public class HatchetBully extends CardImpl { } } -class HatchetBullyCost extends CostImpl { +class HatchetBullyCost extends CostImpl { public HatchetBullyCost() { this.text = "Put a -1/-1 counter on a creature you control"; diff --git a/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java b/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java index 86db219cacc..3a1fddd0e37 100644 --- a/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java +++ b/Mage.Sets/src/mage/sets/eventide/ImpelledGiant.java @@ -97,7 +97,7 @@ public class ImpelledGiant extends CardImpl { } } -class ImpelledGiantCost extends CostImpl { +class ImpelledGiantCost extends CostImpl { TargetControlledPermanent target; diff --git a/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java b/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java index 0388680c4d1..3d0885db0f2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java +++ b/Mage.Sets/src/mage/sets/innistrad/BackFromTheBrink.java @@ -104,7 +104,7 @@ class BackFromTheBrinkEffect extends OneShotEffect { } -class BackFromTheBrinkCost extends CostImpl { +class BackFromTheBrinkCost extends CostImpl { public BackFromTheBrinkCost() { this.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java b/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java index 08d23b102db..80842cf0110 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodlineKeeper.java @@ -99,7 +99,7 @@ class VampireToken extends Token { } } -class ControlFiveVampiresCost extends CostImpl { +class ControlFiveVampiresCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { diff --git a/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java b/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java index 8c9d58c6ab7..a9075e4a801 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkirsdagHighPriest.java @@ -86,7 +86,7 @@ public class SkirsdagHighPriest extends CardImpl { } } -class SkirsdagHighPriestCost extends CostImpl { +class SkirsdagHighPriestCost extends CostImpl { public SkirsdagHighPriestCost() { this.text = "Activate this ability only if a creature died this turn"; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java b/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java index ce2c7b9d26d..397b86445a4 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SageOfHours.java @@ -81,7 +81,7 @@ public class SageOfHours extends CardImpl { } } -class SageOfHoursCost extends CostImpl { +class SageOfHoursCost extends CostImpl { private int removedCounters; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java b/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java index 8da95d9933b..05a187ea6bd 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SilvergillAdept.java @@ -79,7 +79,7 @@ public class SilvergillAdept extends CardImpl { } } -class SilvergillAdeptCost extends CostImpl { +class SilvergillAdeptCost extends CostImpl { private static final FilterCard filter = new FilterCard("Merfolk card"); private GenericManaCost mana = new GenericManaCost(3); diff --git a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java index 274addc457f..f18fcfce239 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java @@ -113,7 +113,7 @@ class AncientHellkiteAbility extends ActivatedAbilityImpl { } } -class AncientHellkiteCost extends CostImpl { +class AncientHellkiteCost extends CostImpl { public AncientHellkiteCost() { this.text = "Activate this ability only if Ancient Hellkite is attacking"; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java b/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java index 064944e7ec2..78b881cb2f2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/LandGrant.java @@ -90,7 +90,7 @@ class LandGrantCondition implements Condition { } } -class LandGrantReavealCost extends CostImpl { +class LandGrantReavealCost extends CostImpl { public LandGrantReavealCost() { this.text = "reveal your hand"; diff --git a/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java b/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java index f38a5e5e23b..e56bc4567fa 100644 --- a/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java +++ b/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java @@ -76,7 +76,7 @@ public class PhyrexianDreadnought extends CardImpl { } } -class PhyrexianDreadnoughtSacrificeCost extends CostImpl { +class PhyrexianDreadnoughtSacrificeCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("any number of creatures with total power 12 or greater"); diff --git a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java index cb660173e62..cac5f234db5 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java +++ b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java @@ -120,7 +120,7 @@ public class RiftElemental extends CardImpl { } } -class RemoveCounterFromCardCost extends CostImpl { +class RemoveCounterFromCardCost extends CostImpl { private TargetCard target; private String name; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java index 1ca80baf95a..2be41b2e032 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java @@ -75,7 +75,7 @@ public class GreenhiltTrainee extends CardImpl { } } -class GreenhiltTraineeCost extends CostImpl { +class GreenhiltTraineeCost extends CostImpl { public GreenhiltTraineeCost() { this.text = "Activate this ability only if Greenhilt Trainee's power is 4 or greater"; diff --git a/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java b/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java index c5fde2c525e..af7dfae5366 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SimianSpiritGuide.java @@ -74,7 +74,7 @@ public class SimianSpiritGuide extends CardImpl { } -class ExileSourceFromHandCost extends CostImpl { +class ExileSourceFromHandCost extends CostImpl { public ExileSourceFromHandCost() { this.text = "Exile {this} from your hand"; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java index ecfdd58abc3..f68facd1cfa 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java @@ -84,7 +84,7 @@ public class RakdosLordOfRiots extends CardImpl { } } -class RakdosLordOfRiotsCost extends CostImpl { +class RakdosLordOfRiotsCost extends CostImpl { public RakdosLordOfRiotsCost() { text = "You can't cast Rakdos, Lord of Riots unless an opponent lost life this turn"; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java index 087c666f632..5d5cb894a0b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TombOfUrami.java @@ -82,7 +82,7 @@ public class TombOfUrami extends CardImpl { } -class SacrificeAllLandCost extends CostImpl { +class SacrificeAllLandCost extends CostImpl { public SacrificeAllLandCost() { this.text = "Sacrifice all lands you control"; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java index fee46721be4..495ef3e0fef 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java @@ -74,7 +74,7 @@ public class BloodshotTrainee extends CardImpl { } } -class BloodshotTraineeCost extends CostImpl { +class BloodshotTraineeCost extends CostImpl { public BloodshotTraineeCost() { this.text = "Activate this ability only if Bloodshot Trainee's power is 4 or greater"; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java b/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java index 116eff846d8..6557b4258b4 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LeechriddenSwamp.java @@ -84,7 +84,7 @@ public class LeechriddenSwamp extends CardImpl { } } -class ControlTwoOrMoreBlackPermanentsCost extends CostImpl { +class ControlTwoOrMoreBlackPermanentsCost extends CostImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); diff --git a/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java b/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java index 3a8080b3f41..0a78d247633 100644 --- a/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java +++ b/Mage.Sets/src/mage/sets/tempest/EssenceBottle.java @@ -77,7 +77,7 @@ public class EssenceBottle extends CardImpl { } } -class EssenceBottleCost extends CostImpl { +class EssenceBottleCost extends CostImpl { private int removedCounters; diff --git a/Mage.Sets/src/mage/sets/tempest/TortureChamber.java b/Mage.Sets/src/mage/sets/tempest/TortureChamber.java index 02d99f34411..47f6118b856 100644 --- a/Mage.Sets/src/mage/sets/tempest/TortureChamber.java +++ b/Mage.Sets/src/mage/sets/tempest/TortureChamber.java @@ -82,7 +82,7 @@ public class TortureChamber extends CardImpl { } } -class TortureChamberCost extends CostImpl { +class TortureChamberCost extends CostImpl { private int removedCounters; diff --git a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java index 647df295574..ce3932d37f6 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java +++ b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java @@ -76,7 +76,7 @@ public class WallOfRoots extends CardImpl { } } -class WallOfRootsCost extends CostImpl { +class WallOfRootsCost extends CostImpl { public WallOfRootsCost() { this.text = "Put a -0/-1 counter on {this}"; diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java index 93a9e8e64c6..e7f8521db48 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java @@ -88,7 +88,7 @@ public class MoltenHydra extends CardImpl { -class RemoveAllCountersSourceCost extends CostImpl { +class RemoveAllCountersSourceCost extends CostImpl { private int amount; private String name; diff --git a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java index 0d5d8adcfc3..c6a388da383 100644 --- a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java @@ -114,7 +114,7 @@ class PermafrostTrapWatcher extends Watcher { } } -class PermafrostTrapAlternativeCost extends AlternativeCostImpl { +class PermafrostTrapAlternativeCost extends AlternativeCostImpl { public PermafrostTrapAlternativeCost() { super("you may pay {U} rather than pay Permafrost Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java b/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java index 7ec5dfebfa1..4e7ed4b83f6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java +++ b/Mage.Sets/src/mage/sets/worldwake/RazorBoomerang.java @@ -76,7 +76,7 @@ public class RazorBoomerang extends CardImpl { } } -class UnattachCost extends CostImpl { +class UnattachCost extends CostImpl { private UUID attachmentid; diff --git a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java index 40fe7630471..9ff6f89b692 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RefractionTrap.java @@ -123,7 +123,7 @@ class RefractionTrapWatcher extends Watcher { } } -class RefractionTrapAlternativeCost extends AlternativeCostImpl { +class RefractionTrapAlternativeCost extends AlternativeCostImpl { public RefractionTrapAlternativeCost() { super("You may pay {W} rather than pay Refraction Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java index 40bd13df614..583b1534cdd 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java @@ -123,7 +123,7 @@ class RicochetTrapWatcher extends Watcher { } } -class RicochetTrapAlternativeCost extends AlternativeCostImpl { +class RicochetTrapAlternativeCost extends AlternativeCostImpl { public RicochetTrapAlternativeCost() { super("You may pay {R} rather than pay Ricochet Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java b/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java index 9517826e491..eaed3ae26a4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/SlingbowTrap.java @@ -80,7 +80,7 @@ public class SlingbowTrap extends CardImpl { } } -class SlingbowTrapAlternativeCost extends AlternativeCostImpl { +class SlingbowTrapAlternativeCost extends AlternativeCostImpl { public SlingbowTrapAlternativeCost() { super("you may pay {G} rather than pay {this}'s mana cost"); diff --git a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java index 59c2abd5880..1b8196e1aee 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java +++ b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java @@ -79,7 +79,7 @@ public class TectonicEdge extends CardImpl { } -class TectonicEdgeCost extends CostImpl { +class TectonicEdgeCost extends CostImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java index d0bcffbfc03..8828fc67718 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java @@ -98,7 +98,7 @@ class ArchiveTrapWatcher extends Watcher { } -class ArchiveTrapAlternativeCost extends AlternativeCostImpl { +class ArchiveTrapAlternativeCost extends AlternativeCostImpl { public ArchiveTrapAlternativeCost() { super("you may pay {0} rather than pay Archive Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java index 0edfd2267b6..33d3dfdb688 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java @@ -75,7 +75,7 @@ public class ArrowVolleyTrap extends CardImpl { } } -class ArrowVolleyTrapAlternativeCost extends AlternativeCostImpl { +class ArrowVolleyTrapAlternativeCost extends AlternativeCostImpl { public ArrowVolleyTrapAlternativeCost() { super("you may pay {1}{W} rather than pay Arrow Volley Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java index 4b9200c1fc9..d85e9eb8f3e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java @@ -111,7 +111,7 @@ class BalothCageTrapWatcher extends Watcher { } } -class BalothCageTrapAlternativeCost extends AlternativeCostImpl { +class BalothCageTrapAlternativeCost extends AlternativeCostImpl { public BalothCageTrapAlternativeCost() { super("you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/BlazingTorch.java b/Mage.Sets/src/mage/sets/zendikar/BlazingTorch.java index b7bb7e18fe4..c30fe842942 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BlazingTorch.java +++ b/Mage.Sets/src/mage/sets/zendikar/BlazingTorch.java @@ -117,7 +117,7 @@ class BlazingTorchEvasionEffect extends RestrictionEffect { +class BlazingTorchCost extends CostImpl { public BlazingTorchCost() { this.text = "Sacrifice Blazing Torch"; diff --git a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java index abbbec3eed6..00f7c04027a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/CobraTrap.java @@ -113,7 +113,7 @@ class CobraTrapWatcher extends Watcher { } } -class CobraTrapAlternativeCost extends AlternativeCostImpl { +class CobraTrapAlternativeCost extends AlternativeCostImpl { public CobraTrapAlternativeCost() { super("you may pay {G} rather than pay Cobra Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java index 806b689ad61..7e21bf4629f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java +++ b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java @@ -70,7 +70,7 @@ public class FeastOfBlood extends CardImpl { } } -class FeastOfBloodCost extends CostImpl { +class FeastOfBloodCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java index 3e8a832a18e..e494a9f9c52 100644 --- a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java @@ -113,7 +113,7 @@ class ControllerDamagedByCreatureWatcher extends Watcher { } } -class InfernoTrapAlternativeCost extends AlternativeCostImpl { +class InfernoTrapAlternativeCost extends AlternativeCostImpl { public InfernoTrapAlternativeCost() { super("you may pay {R} rather than pay Inferno Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java index a034d03bb4e..96737265ec1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java @@ -135,7 +135,7 @@ class LavaballTrapWatcher extends Watcher { } } -class LavaballTrapAlternativeCost extends AlternativeCostImpl { +class LavaballTrapAlternativeCost extends AlternativeCostImpl { public LavaballTrapAlternativeCost() { super("you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java index 85846d1df35..556b4c9aff3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java @@ -78,7 +78,7 @@ public class LethargyTrap extends CardImpl { } } -class LethargyTrapAlternativeCost extends AlternativeCostImpl { +class LethargyTrapAlternativeCost extends AlternativeCostImpl { public LethargyTrapAlternativeCost() { super("you may pay {U} rather than pay Lethargy Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java index ffe0a21fe42..3fae8dece06 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java @@ -106,7 +106,7 @@ class LuminarchAscensionTriggeredAbility extends TriggeredAbilityImpl { } } -class SourceHasCountersCost extends CostImpl { +class SourceHasCountersCost extends CostImpl { private int counters; private CounterType counterType; diff --git a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java index 9f7b7355a52..d210ee7ca65 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindbreakTrap.java @@ -127,7 +127,7 @@ class MindbreakTrapWatcher extends Watcher { } -class MindbreakTrapAlternativeCost extends AlternativeCostImpl { +class MindbreakTrapAlternativeCost extends AlternativeCostImpl { public MindbreakTrapAlternativeCost() { super("you may pay {0} rather than pay Mindbreak Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java index 9980a662cea..861eef51997 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java @@ -76,7 +76,7 @@ public class NeedlebiteTrap extends CardImpl { } } -class NeedlebiteTrapAlternativeCost extends AlternativeCostImpl { +class NeedlebiteTrapAlternativeCost extends AlternativeCostImpl { public NeedlebiteTrapAlternativeCost() { super("If an opponent gained life this turn, you may pay {B} rather than pay {this}'s mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java b/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java index d34a14cdfa2..f2a3b8d87a6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java @@ -79,7 +79,7 @@ public class PitfallTrap extends CardImpl { } } -class PitfallTrapAlternativeCost extends AlternativeCostImpl { +class PitfallTrapAlternativeCost extends AlternativeCostImpl { public PitfallTrapAlternativeCost() { super("you may pay {W} rather than pay Pitfall Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java index 4f4cd9c4ddf..1a690766e22 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java @@ -78,7 +78,7 @@ public class RavenousTrap extends CardImpl { } } -class RavenousTrapAlternativeCost extends AlternativeCostImpl { +class RavenousTrapAlternativeCost extends AlternativeCostImpl { public RavenousTrapAlternativeCost() { super("If an opponent had three or more cards put into his or her graveyard from anywhere this turn, you may pay {0} rather than pay Ravenous Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 18c134b06ea..7a8f5090562 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java @@ -141,7 +141,7 @@ class CardsDrawnOpponentWatcher extends Watcher { } } -class RuneflareTrapAlternativeCost extends AlternativeCostImpl { +class RuneflareTrapAlternativeCost extends AlternativeCostImpl { public RuneflareTrapAlternativeCost() { super("you may pay {R} rather than pay Runeflare Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java index 71a343946c0..fcf068795b3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/SummoningTrap.java @@ -126,7 +126,7 @@ class SummoningTrapWatcher extends Watcher { } } -class SummoningTrapAlternativeCost extends AlternativeCostImpl { +class SummoningTrapAlternativeCost extends AlternativeCostImpl { public SummoningTrapAlternativeCost() { super("you may pay {0} rather than pay Summoning Trap's mana cost"); diff --git a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java index 56b545bf374..45dd463b0c6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java @@ -132,7 +132,7 @@ class WhiplashTrapWatcher extends Watcher { } } -class WhiplashAlternativeCost extends AlternativeCostImpl { +class WhiplashAlternativeCost extends AlternativeCostImpl { public WhiplashAlternativeCost() { super("you may pay {U} rather than pay Whiplash Trap's mana cost"); diff --git a/Mage/src/mage/abilities/costs/AlternativeCostImpl.java b/Mage/src/mage/abilities/costs/AlternativeCostImpl.java index 47844123ca6..8b2d93a68af 100644 --- a/Mage/src/mage/abilities/costs/AlternativeCostImpl.java +++ b/Mage/src/mage/abilities/costs/AlternativeCostImpl.java @@ -3,7 +3,7 @@ package mage.abilities.costs; import mage.abilities.Ability; import mage.game.Game; -public class AlternativeCostImpl> extends CostsImpl implements AlternativeCost { +public class AlternativeCostImpl extends CostsImpl implements AlternativeCost { protected String name; diff --git a/Mage/src/mage/abilities/costs/CostImpl.java b/Mage/src/mage/abilities/costs/CostImpl.java index 4b08aded262..7b40c74461a 100644 --- a/Mage/src/mage/abilities/costs/CostImpl.java +++ b/Mage/src/mage/abilities/costs/CostImpl.java @@ -33,16 +33,13 @@ import mage.target.Targets; import java.util.UUID; -public abstract class CostImpl> implements Cost { +public abstract class CostImpl implements Cost { protected UUID id; protected String text; protected boolean paid; protected Targets targets; - @Override - public abstract T copy(); - public CostImpl() { id = UUID.randomUUID(); paid = false; diff --git a/Mage/src/mage/abilities/costs/OptionalAdditionalCostImpl.java b/Mage/src/mage/abilities/costs/OptionalAdditionalCostImpl.java index 3f331bb5fed..6132df52fc8 100644 --- a/Mage/src/mage/abilities/costs/OptionalAdditionalCostImpl.java +++ b/Mage/src/mage/abilities/costs/OptionalAdditionalCostImpl.java @@ -35,7 +35,7 @@ package mage.abilities.costs; */ -public class OptionalAdditionalCostImpl > extends CostsImpl implements OptionalAdditionalCost{ +public class OptionalAdditionalCostImpl extends CostsImpl implements OptionalAdditionalCost{ protected String name; diff --git a/Mage/src/mage/abilities/costs/VariableCostImpl.java b/Mage/src/mage/abilities/costs/VariableCostImpl.java index 7c45e22a5ff..2592c1a2a34 100644 --- a/Mage/src/mage/abilities/costs/VariableCostImpl.java +++ b/Mage/src/mage/abilities/costs/VariableCostImpl.java @@ -38,10 +38,9 @@ import mage.target.Targets; /** * * @author LevelX2 - * @param variable cost type */ -public abstract class VariableCostImpl> implements Cost, VariableCost { +public abstract class VariableCostImpl implements Cost, VariableCost { protected UUID id; protected String text; @@ -51,9 +50,6 @@ public abstract class VariableCostImpl> implements protected String xText; protected String actionText; - @Override - public abstract T copy(); - public VariableCostImpl(String actionText) { this("X", actionText); } diff --git a/Mage/src/mage/abilities/costs/common/ControlPermanentCost.java b/Mage/src/mage/abilities/costs/common/ControlPermanentCost.java index 8739e35b209..16548614827 100644 --- a/Mage/src/mage/abilities/costs/common/ControlPermanentCost.java +++ b/Mage/src/mage/abilities/costs/common/ControlPermanentCost.java @@ -7,7 +7,7 @@ import mage.game.Game; import java.util.UUID; -public class ControlPermanentCost extends CostImpl { +public class ControlPermanentCost extends CostImpl { private FilterControlledPermanent filter; public ControlPermanentCost(FilterControlledPermanent filter) { diff --git a/Mage/src/mage/abilities/costs/common/DiscardHandCost.java b/Mage/src/mage/abilities/costs/common/DiscardHandCost.java index c05c31c4172..e8f5af01763 100644 --- a/Mage/src/mage/abilities/costs/common/DiscardHandCost.java +++ b/Mage/src/mage/abilities/costs/common/DiscardHandCost.java @@ -40,7 +40,7 @@ import mage.players.Player; * @author LevelX2 */ -public class DiscardHandCost extends CostImpl { +public class DiscardHandCost extends CostImpl { public DiscardHandCost() { diff --git a/Mage/src/mage/abilities/costs/common/DiscardSourceCost.java b/Mage/src/mage/abilities/costs/common/DiscardSourceCost.java index 116046f12ed..23d3114ba8f 100644 --- a/Mage/src/mage/abilities/costs/common/DiscardSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/DiscardSourceCost.java @@ -39,7 +39,7 @@ import mage.players.Player; * * @author BetaSteward_at_googlemail.com */ -public class DiscardSourceCost extends CostImpl { +public class DiscardSourceCost extends CostImpl { public DiscardSourceCost() {} diff --git a/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java b/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java index 736b08520c3..86c0d6bd64e 100644 --- a/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCardInHand; * * @author BetaSteward_at_googlemail.com */ -public class DiscardTargetCost extends CostImpl { +public class DiscardTargetCost extends CostImpl { List cards = new ArrayList<>(); protected boolean randomDiscard; diff --git a/Mage/src/mage/abilities/costs/common/DiscardXTargetCost.java b/Mage/src/mage/abilities/costs/common/DiscardXTargetCost.java index e0b84d55f59..3b05d071d0b 100644 --- a/Mage/src/mage/abilities/costs/common/DiscardXTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/DiscardXTargetCost.java @@ -41,7 +41,7 @@ import mage.target.common.TargetCardInHand; * @author LevelX2 */ -public class DiscardXTargetCost extends VariableCostImpl { +public class DiscardXTargetCost extends VariableCostImpl { protected FilterCard filter; diff --git a/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java b/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java index 69f6b6a56e2..fd588a7e5a5 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java @@ -44,7 +44,7 @@ import mage.util.CardUtil; * * @author nantuko */ -public class ExileFromGraveCost extends CostImpl { +public class ExileFromGraveCost extends CostImpl { public ExileFromGraveCost(TargetCardInYourGraveyard target) { this.addTarget(target); diff --git a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java index 6a76d6054a0..81f709b539e 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCardInHand; * * @author LevelX2 */ -public class ExileFromHandCost extends CostImpl { +public class ExileFromHandCost extends CostImpl { List cards = new ArrayList(); diff --git a/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java b/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java index f6860e8c94f..be9b4813853 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java @@ -42,7 +42,7 @@ import mage.target.TargetSpell; * * @author LevelX2 */ -public class ExileFromStackCost extends CostImpl { +public class ExileFromStackCost extends CostImpl { public ExileFromStackCost(TargetSpell target) { this.addTarget(target); diff --git a/Mage/src/mage/abilities/costs/common/ExileSourceCost.java b/Mage/src/mage/abilities/costs/common/ExileSourceCost.java index 6b59148661f..af3c95e0261 100644 --- a/Mage/src/mage/abilities/costs/common/ExileSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileSourceCost.java @@ -39,7 +39,7 @@ import mage.game.permanent.Permanent; * * @author BetaSteward_at_googlemail.com */ -public class ExileSourceCost extends CostImpl { +public class ExileSourceCost extends CostImpl { public ExileSourceCost() { this.text = "Exile {this}"; diff --git a/Mage/src/mage/abilities/costs/common/ExileSourceFromGraveCost.java b/Mage/src/mage/abilities/costs/common/ExileSourceFromGraveCost.java index 6bf54c76fa0..569cd4c9b4e 100644 --- a/Mage/src/mage/abilities/costs/common/ExileSourceFromGraveCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileSourceFromGraveCost.java @@ -39,7 +39,7 @@ import java.util.UUID; * * @author magenoxx_at_gmail.com */ -public class ExileSourceFromGraveCost extends CostImpl { +public class ExileSourceFromGraveCost extends CostImpl { public ExileSourceFromGraveCost() { this.text = "Exile this card from your graveyard"; diff --git a/Mage/src/mage/abilities/costs/common/ExileXFromYourGraveCost.java b/Mage/src/mage/abilities/costs/common/ExileXFromYourGraveCost.java index 7b92635e0d9..356dac64ec5 100644 --- a/Mage/src/mage/abilities/costs/common/ExileXFromYourGraveCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileXFromYourGraveCost.java @@ -41,7 +41,7 @@ import mage.target.common.TargetCardInYourGraveyard; * @author LevelX2 */ -public class ExileXFromYourGraveCost extends VariableCostImpl { +public class ExileXFromYourGraveCost extends VariableCostImpl { protected FilterCard filter; diff --git a/Mage/src/mage/abilities/costs/common/GainLifeOpponentCost.java b/Mage/src/mage/abilities/costs/common/GainLifeOpponentCost.java index 13fdfd03656..5bb7caa1819 100644 --- a/Mage/src/mage/abilities/costs/common/GainLifeOpponentCost.java +++ b/Mage/src/mage/abilities/costs/common/GainLifeOpponentCost.java @@ -22,7 +22,7 @@ import mage.target.TargetPlayer; * * @author LevelX2 */ -public class GainLifeOpponentCost extends CostImpl { +public class GainLifeOpponentCost extends CostImpl { private static final FilterPlayer filter = new FilterPlayer("opponent that can gain life"); diff --git a/Mage/src/mage/abilities/costs/common/GainLifePlayersCost.java b/Mage/src/mage/abilities/costs/common/GainLifePlayersCost.java index 32e321478e6..e674eec445e 100644 --- a/Mage/src/mage/abilities/costs/common/GainLifePlayersCost.java +++ b/Mage/src/mage/abilities/costs/common/GainLifePlayersCost.java @@ -38,7 +38,7 @@ import mage.players.Player; * * @author LevelX2 */ -public class GainLifePlayersCost extends CostImpl { +public class GainLifePlayersCost extends CostImpl { private final int amount; diff --git a/Mage/src/mage/abilities/costs/common/MetalcraftCost.java b/Mage/src/mage/abilities/costs/common/MetalcraftCost.java index 621f2c36bb5..6f4a8577afe 100644 --- a/Mage/src/mage/abilities/costs/common/MetalcraftCost.java +++ b/Mage/src/mage/abilities/costs/common/MetalcraftCost.java @@ -40,7 +40,7 @@ import mage.game.Game; * * @author BetaSteward_at_googlemail.com */ -public class MetalcraftCost extends CostImpl { +public class MetalcraftCost extends CostImpl { private static final FilterPermanent filter = new FilterPermanent("artifact"); diff --git a/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java b/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java index b828ae724bd..de5715fa557 100644 --- a/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java +++ b/Mage/src/mage/abilities/costs/common/OnlyDuringUpkeepCost.java @@ -37,7 +37,7 @@ import mage.game.Game; * * @author BetaSteward_at_googlemail.com */ -public class OnlyDuringUpkeepCost extends CostImpl { +public class OnlyDuringUpkeepCost extends CostImpl { public OnlyDuringUpkeepCost() { text = "Activate this ability only during your upkeep"; diff --git a/Mage/src/mage/abilities/costs/common/PayLifeCost.java b/Mage/src/mage/abilities/costs/common/PayLifeCost.java index 279b6d5ed30..1861822ae84 100644 --- a/Mage/src/mage/abilities/costs/common/PayLifeCost.java +++ b/Mage/src/mage/abilities/costs/common/PayLifeCost.java @@ -38,7 +38,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class PayLifeCost extends CostImpl { +public class PayLifeCost extends CostImpl { private final int amount; diff --git a/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java b/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java index 4cf0a1cc5b1..5bfeff317d9 100644 --- a/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java +++ b/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java @@ -40,7 +40,7 @@ import mage.game.permanent.Permanent; * * @author BetaSteward_at_googlemail.com */ -public class PayLoyaltyCost extends CostImpl { +public class PayLoyaltyCost extends CostImpl { private final int amount; diff --git a/Mage/src/mage/abilities/costs/common/PayVariableLifeCost.java b/Mage/src/mage/abilities/costs/common/PayVariableLifeCost.java index 1058cec9f4d..cbbc17137c7 100644 --- a/Mage/src/mage/abilities/costs/common/PayVariableLifeCost.java +++ b/Mage/src/mage/abilities/costs/common/PayVariableLifeCost.java @@ -39,7 +39,7 @@ import mage.players.Player; * @author LevelX2 */ -public class PayVariableLifeCost extends VariableCostImpl { +public class PayVariableLifeCost extends VariableCostImpl { public PayVariableLifeCost() { this(false); diff --git a/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java b/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java index ac2ae090720..bedeffa6b63 100644 --- a/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java +++ b/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java @@ -40,7 +40,7 @@ import mage.game.permanent.Permanent; * * @author BetaSteward_at_googlemail.com */ -public class PayVariableLoyaltyCost extends VariableCostImpl { +public class PayVariableLoyaltyCost extends VariableCostImpl { public PayVariableLoyaltyCost() { super("loyality counters to remove"); diff --git a/Mage/src/mage/abilities/costs/common/PutCountersSourceCost.java b/Mage/src/mage/abilities/costs/common/PutCountersSourceCost.java index 3a728c475d2..45b8669df55 100644 --- a/Mage/src/mage/abilities/costs/common/PutCountersSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/PutCountersSourceCost.java @@ -40,7 +40,7 @@ import mage.util.CardUtil; * * @author jeffwadsworth */ -public class PutCountersSourceCost extends CostImpl { +public class PutCountersSourceCost extends CostImpl { private int amount; private String name; diff --git a/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java b/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java index 0409e434278..d914793da6d 100644 --- a/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java +++ b/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java @@ -43,7 +43,7 @@ import mage.util.CardUtil; */ -public class PutTopCardOfYourLibraryToGraveyardCost extends CostImpl { +public class PutTopCardOfYourLibraryToGraveyardCost extends CostImpl { int numberOfCards; diff --git a/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java b/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java index 1aa95cd7bf8..5868fd1a08c 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java @@ -49,7 +49,7 @@ import mage.util.CardUtil; * * @author LevelX */ -public class RemoveCounterCost extends CostImpl { +public class RemoveCounterCost extends CostImpl { private TargetPermanent target; private String name; diff --git a/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java index c3d86033413..251ade18f01 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java @@ -40,7 +40,7 @@ import mage.util.CardUtil; * * @author BetaSteward_at_googlemail.com */ -public class RemoveCountersSourceCost extends CostImpl { +public class RemoveCountersSourceCost extends CostImpl { private int amount; private String name; diff --git a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java b/Mage/src/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java index 21413528c82..29cc8447116 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java @@ -39,7 +39,7 @@ import mage.game.permanent.Permanent; * * @author LevelX2 */ -public class RemoveVariableCountersSourceCost extends VariableCostImpl { +public class RemoveVariableCountersSourceCost extends VariableCostImpl { protected int minimalCountersToPay = 0; private String counterName; diff --git a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java b/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java index 356f79cf2c0..85828c8ee6e 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; * * @author LevelX */ -public class RemoveVariableCountersTargetCost extends VariableCostImpl { +public class RemoveVariableCountersTargetCost extends VariableCostImpl { protected FilterPermanent filter; protected CounterType counterTypeToRemove; diff --git a/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java b/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java index 0cb9e5d5d8b..dbc3ea94ab0 100644 --- a/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java @@ -39,7 +39,7 @@ import mage.game.permanent.Permanent; /** * @author Loki */ -public class ReturnToHandSourceCost extends CostImpl { +public class ReturnToHandSourceCost extends CostImpl { public ReturnToHandSourceCost() { this.text = "return {this} to it's owner's hand"; diff --git a/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java b/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java index 2b9659fff5f..c3e46849858 100644 --- a/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/ReturnToHandTargetCost.java @@ -42,7 +42,7 @@ import mage.target.common.TargetControlledPermanent; * * @author BetaSteward_at_googlemail.com */ -public class ReturnToHandTargetCost extends CostImpl { +public class ReturnToHandTargetCost extends CostImpl { public ReturnToHandTargetCost(TargetControlledPermanent target) { this.addTarget(target); diff --git a/Mage/src/mage/abilities/costs/common/RevealSourceFromYourHandCost.java b/Mage/src/mage/abilities/costs/common/RevealSourceFromYourHandCost.java index 405b5fe8382..0148d66e1d7 100644 --- a/Mage/src/mage/abilities/costs/common/RevealSourceFromYourHandCost.java +++ b/Mage/src/mage/abilities/costs/common/RevealSourceFromYourHandCost.java @@ -45,7 +45,7 @@ import mage.players.Player; * */ -public class RevealSourceFromYourHandCost extends CostImpl { +public class RevealSourceFromYourHandCost extends CostImpl { public RevealSourceFromYourHandCost() { this.text = "reveal {this} from your hand"; } diff --git a/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java b/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java index 5de06babaa4..b5daf297bb0 100644 --- a/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java +++ b/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java @@ -42,7 +42,7 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; -public class RevealTargetFromHandCost extends CostImpl { +public class RevealTargetFromHandCost extends CostImpl { public int convertedManaCosts = 0; protected int numberCardsRevealed = 0; diff --git a/Mage/src/mage/abilities/costs/common/SacrificeAllCost.java b/Mage/src/mage/abilities/costs/common/SacrificeAllCost.java index b95aac879ff..62934c2bac0 100644 --- a/Mage/src/mage/abilities/costs/common/SacrificeAllCost.java +++ b/Mage/src/mage/abilities/costs/common/SacrificeAllCost.java @@ -41,7 +41,7 @@ import mage.target.common.TargetControlledPermanent; * * @author LevelX2 */ -public class SacrificeAllCost extends CostImpl { +public class SacrificeAllCost extends CostImpl { private FilterPermanent filter; private List permanents = new ArrayList(); diff --git a/Mage/src/mage/abilities/costs/common/SacrificeSourceCost.java b/Mage/src/mage/abilities/costs/common/SacrificeSourceCost.java index 1b82d89e346..f4026693cbd 100644 --- a/Mage/src/mage/abilities/costs/common/SacrificeSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/SacrificeSourceCost.java @@ -39,7 +39,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class SacrificeSourceCost extends CostImpl { +public class SacrificeSourceCost extends CostImpl { public SacrificeSourceCost() { this.text = "Sacrifice {this}"; diff --git a/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java b/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java index f3d567f31b5..fe19622b153 100644 --- a/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java @@ -43,7 +43,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class SacrificeTargetCost extends CostImpl { +public class SacrificeTargetCost extends CostImpl { List permanents = new ArrayList<>(); diff --git a/Mage/src/mage/abilities/costs/common/SacrificeXTargetCost.java b/Mage/src/mage/abilities/costs/common/SacrificeXTargetCost.java index 783f13a232d..25ea5a6908b 100644 --- a/Mage/src/mage/abilities/costs/common/SacrificeXTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/SacrificeXTargetCost.java @@ -39,7 +39,7 @@ import mage.target.common.TargetControlledPermanent; * * @author LevelX2 */ -public class SacrificeXTargetCost extends VariableCostImpl { +public class SacrificeXTargetCost extends VariableCostImpl { protected FilterControlledPermanent filter; diff --git a/Mage/src/mage/abilities/costs/common/TapSourceCost.java b/Mage/src/mage/abilities/costs/common/TapSourceCost.java index 6d61b6b1e32..22395939a99 100644 --- a/Mage/src/mage/abilities/costs/common/TapSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/TapSourceCost.java @@ -41,7 +41,7 @@ import mage.game.permanent.Permanent; * * @author BetaSteward_at_googlemail.com */ -public class TapSourceCost extends CostImpl { +public class TapSourceCost extends CostImpl { public TapSourceCost() { this.text = "{T}"; diff --git a/Mage/src/mage/abilities/costs/common/TapTargetCost.java b/Mage/src/mage/abilities/costs/common/TapTargetCost.java index 9e4d6fac4a7..4086cd28868 100644 --- a/Mage/src/mage/abilities/costs/common/TapTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/TapTargetCost.java @@ -42,7 +42,7 @@ import mage.util.CardUtil; * * @author BetaSteward_at_googlemail.com */ -public class TapTargetCost extends CostImpl { +public class TapTargetCost extends CostImpl { TargetControlledPermanent target; diff --git a/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java b/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java index 551839113d9..7da86d69f6e 100644 --- a/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java @@ -39,7 +39,7 @@ import mage.target.common.TargetControlledPermanent; * * @author BetaSteward_at_googlemail.com */ -public class TapVariableTargetCost extends VariableCostImpl { +public class TapVariableTargetCost extends VariableCostImpl { protected FilterControlledPermanent filter; diff --git a/Mage/src/mage/abilities/costs/common/UntapSourceCost.java b/Mage/src/mage/abilities/costs/common/UntapSourceCost.java index a79f58a26c2..3752104f5fd 100644 --- a/Mage/src/mage/abilities/costs/common/UntapSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/UntapSourceCost.java @@ -38,7 +38,7 @@ import mage.game.permanent.Permanent; * * @author Plopman */ -public class UntapSourceCost extends CostImpl { +public class UntapSourceCost extends CostImpl { public UntapSourceCost() { this.text = "{Q}"; diff --git a/Mage/src/mage/abilities/costs/common/UntapTargetCost.java b/Mage/src/mage/abilities/costs/common/UntapTargetCost.java index 98b2b012773..d2b6a8ec7f7 100644 --- a/Mage/src/mage/abilities/costs/common/UntapTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/UntapTargetCost.java @@ -42,7 +42,7 @@ import java.util.UUID; * * @author jeffwadsworth */ -public class UntapTargetCost extends CostImpl { +public class UntapTargetCost extends CostImpl { TargetControlledPermanent target; diff --git a/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java b/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java index 0a6b2f58f0e..2ab6f139f20 100644 --- a/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java @@ -34,7 +34,7 @@ import mage.constants.ColoredManaSymbol; import mage.game.Game; import mage.players.ManaPool; -public class ColoredManaCost extends ManaCostImpl { +public class ColoredManaCost extends ManaCostImpl { protected ColoredManaSymbol mana; diff --git a/Mage/src/mage/abilities/costs/mana/GenericManaCost.java b/Mage/src/mage/abilities/costs/mana/GenericManaCost.java index 20742d257b7..87c4496c827 100644 --- a/Mage/src/mage/abilities/costs/mana/GenericManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/GenericManaCost.java @@ -34,7 +34,7 @@ import mage.constants.ColoredManaSymbol; import mage.game.Game; import mage.players.ManaPool; -public class GenericManaCost extends ManaCostImpl { +public class GenericManaCost extends ManaCostImpl { protected int mana; diff --git a/Mage/src/mage/abilities/costs/mana/HybridManaCost.java b/Mage/src/mage/abilities/costs/mana/HybridManaCost.java index 273aa41a42d..985490cfb5b 100644 --- a/Mage/src/mage/abilities/costs/mana/HybridManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/HybridManaCost.java @@ -33,7 +33,7 @@ import mage.constants.ColoredManaSymbol; import mage.game.Game; import mage.players.ManaPool; -public class HybridManaCost extends ManaCostImpl { +public class HybridManaCost extends ManaCostImpl { private final ColoredManaSymbol mana1; private final ColoredManaSymbol mana2; diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java index e24343cdb74..25037231831 100644 --- a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java +++ b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java @@ -41,16 +41,13 @@ import mage.players.ManaPool; import mage.players.Player; -public abstract class ManaCostImpl> extends CostImpl implements ManaCost { +public abstract class ManaCostImpl extends CostImpl implements ManaCost { protected Mana payment; protected Mana cost; protected ManaOptions options; protected Filter sourceFilter; - @Override - public abstract T copy(); - public ManaCostImpl() { payment = new Mana(); options = new ManaOptions(); @@ -204,10 +201,7 @@ public abstract class ManaCostImpl> extends CostImpl= mana) { - return true; - } - return false; + return this.payment.count() >= mana; } @Override diff --git a/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java b/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java index 08ce5ebfacc..44c207a159e 100644 --- a/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java @@ -33,7 +33,7 @@ import mage.constants.ColoredManaSymbol; import mage.game.Game; import mage.players.ManaPool; -public class MonoHybridManaCost extends ManaCostImpl { +public class MonoHybridManaCost extends ManaCostImpl { private final ColoredManaSymbol mana; private int mana2 = 2; diff --git a/Mage/src/mage/abilities/costs/mana/VariableManaCost.java b/Mage/src/mage/abilities/costs/mana/VariableManaCost.java index 4d67b6c2b68..ee08fe83b0b 100644 --- a/Mage/src/mage/abilities/costs/mana/VariableManaCost.java +++ b/Mage/src/mage/abilities/costs/mana/VariableManaCost.java @@ -41,7 +41,7 @@ import mage.players.ManaPool; * * @author BetaSteward_at_googlemail.com */ -public class VariableManaCost extends ManaCostImpl implements VariableCost { +public class VariableManaCost extends ManaCostImpl implements VariableCost { protected int multiplier; protected FilterMana filter; diff --git a/Mage/src/mage/abilities/keyword/ChampionAbility.java b/Mage/src/mage/abilities/keyword/ChampionAbility.java index 48fca78b0c4..6e1f3b030c2 100644 --- a/Mage/src/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/mage/abilities/keyword/ChampionAbility.java @@ -133,7 +133,7 @@ public class ChampionAbility extends StaticAbility { } } -class ChampionExileCost extends CostImpl { +class ChampionExileCost extends CostImpl { private String exileZone = null; diff --git a/Mage/src/mage/abilities/keyword/NinjutsuAbility.java b/Mage/src/mage/abilities/keyword/NinjutsuAbility.java index 3d3cb330f79..53986bdfc7d 100644 --- a/Mage/src/mage/abilities/keyword/NinjutsuAbility.java +++ b/Mage/src/mage/abilities/keyword/NinjutsuAbility.java @@ -144,7 +144,7 @@ class NinjutsuEffect extends OneShotEffect { } } -class ReturnAttackerToHandTargetCost extends CostImpl { +class ReturnAttackerToHandTargetCost extends CostImpl { private UUID defendingPlayerId; @@ -188,7 +188,7 @@ class ReturnAttackerToHandTargetCost extends CostImpl { +class RevealNinjutsuCardCost extends CostImpl { public RevealNinjutsuCardCost() { this.text = "reveal ninjutsu card";