diff --git a/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java b/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java index 39756db470..0da15e087e 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java @@ -96,7 +96,7 @@ class AnathemancerCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new AnathemancerCount(); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java b/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java index 267dc33d72..86a77bd7b4 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Malignus.java @@ -98,7 +98,7 @@ class HighestLifeTotalAmongOpponentsCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CardsInControllerHandCount(); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java index 00151b8026..d5af6f49a3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java @@ -115,7 +115,7 @@ class TappedCreaturesControlledByTargetCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new TappedCreaturesControlledByTargetCount(); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java index 29e19e189c..72f510a546 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java @@ -199,7 +199,7 @@ class CardsInTargetHandCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CardsInTargetHandCount(); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java index c027528eff..da55db6b46 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java @@ -120,7 +120,7 @@ class ZuberasDiedDynamicValue implements DynamicValue { } @Override - public ZuberasDiedDynamicValue clone() { + public ZuberasDiedDynamicValue copy() { return new ZuberasDiedDynamicValue(); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java index 5333765145..b4238b7e1e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java @@ -79,7 +79,7 @@ class SilentChantZuberaDynamicValue implements DynamicValue { } @Override - public SilentChantZuberaDynamicValue clone() { + public SilentChantZuberaDynamicValue copy() { return new SilentChantZuberaDynamicValue(); } diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java index ae45c715ee..57f5a190c8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java @@ -140,7 +140,7 @@ class CursesAttachedCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CursesAttachedCount(); } diff --git a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java index 1385946b1e..6f09e5daa0 100644 --- a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java +++ b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java @@ -137,7 +137,7 @@ class CardsInTargetPlayerHandCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new mage.abilities.dynamicvalue.common.CardsInControllerHandCount(); } diff --git a/Mage.Sets/src/mage/sets/innistrad/EndlessRanksOfTheDead.java b/Mage.Sets/src/mage/sets/innistrad/EndlessRanksOfTheDead.java index 3ec00ab02d..1ff13af8e8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/EndlessRanksOfTheDead.java +++ b/Mage.Sets/src/mage/sets/innistrad/EndlessRanksOfTheDead.java @@ -85,7 +85,7 @@ class HalfZombiesCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new HalfZombiesCount(); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java b/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java index 8ba6114b4a..68d05f6fbd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java +++ b/Mage.Sets/src/mage/sets/innistrad/GarrukTheVeilCursed.java @@ -116,7 +116,7 @@ class GarrukTheVeilCursedValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return this; } diff --git a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java index 3c44f0818e..656b7c10aa 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java +++ b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java @@ -176,7 +176,7 @@ class GutterGrimeCounters implements DynamicValue { } @Override - public GutterGrimeCounters clone() { + public GutterGrimeCounters copy() { return this; } diff --git a/Mage.Sets/src/mage/sets/innistrad/RunechantersPike.java b/Mage.Sets/src/mage/sets/innistrad/RunechantersPike.java index b88283c4d1..b008d630e9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RunechantersPike.java +++ b/Mage.Sets/src/mage/sets/innistrad/RunechantersPike.java @@ -96,7 +96,7 @@ class RunechantersPikeValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return this; } diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index cc3610d790..1966ed21d5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java @@ -104,7 +104,7 @@ class ChandraNalaarXValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return defaultValue; } diff --git a/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java index a3b8caa8c4..8bb4b1b9ae 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2012/SuturedGhoul.java @@ -160,7 +160,7 @@ class SuturedGhoulPowerCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return getInstance(); } @@ -202,7 +202,7 @@ class SuturedGhoulToughnessCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return getInstance(); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java b/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java index f4355d2893..f782fb4606 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java @@ -98,7 +98,7 @@ class GolemSkinGauntletsAttachedCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new GolemSkinGauntletsAttachedCount(this); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java index e3e0e2ea99..6d0cf11b1b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/FreshMeat.java @@ -123,7 +123,7 @@ class FreshMeatDynamicValue implements DynamicValue { } @Override - public FreshMeatDynamicValue clone() { + public FreshMeatDynamicValue copy() { return new FreshMeatDynamicValue(); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java index f850e6591d..59ffffe2ba 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java @@ -87,7 +87,7 @@ class IchorExplosionDynamicValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return this; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java index 4d2b314eaf..b72a9e29c0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java @@ -91,7 +91,7 @@ class OpponentsPoisonCountersCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new OpponentsPoisonCountersCount(); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java b/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java index c180f5bf87..2e98aa3f71 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CivicSaber.java @@ -89,7 +89,7 @@ class CivicSaberColorCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CivicSaberColorCount(this); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java index a2eac84a3d..a05e42ce87 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java @@ -108,7 +108,7 @@ class CardsInEnchantedControllerHandCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new mage.abilities.dynamicvalue.common.CardsInControllerHandCount(); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java index d386ffb4c7..0382617737 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java @@ -145,7 +145,7 @@ class MyrBattlesphereEffect extends OneShotEffect { public MyrBattlesphereEffect(final MyrBattlesphereEffect effect) { super(effect); - this.amount = effect.amount.clone(); + this.amount = effect.amount.copy(); } @Override diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java index ab95fd5467..a6b5714a55 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/StrataScythe.java @@ -140,7 +140,7 @@ class SameNameAsExiledCountValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return instance; } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java b/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java index c1da10ad95..45bbde0fa4 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BlessedReversal.java @@ -77,7 +77,7 @@ class BlessedReversalCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return this; } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java index 0e6f4598a6..d665b5b307 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MoltenHydra.java @@ -158,7 +158,7 @@ class MotltenHydraDynamicValue implements DynamicValue { } @Override - public MotltenHydraDynamicValue clone() { + public MotltenHydraDynamicValue copy() { return new MotltenHydraDynamicValue(this); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java b/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java index f5f4364b7c..8597562b36 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MultaniMaroSorcerer.java @@ -88,7 +88,7 @@ class CardsInHandCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CardsInHandCount(); } diff --git a/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java b/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java index 61f08bfb71..e32ac089e8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java +++ b/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java @@ -93,7 +93,7 @@ class BoldDefensePTCount implements DynamicValue { @Override - public DynamicValue clone() { + public DynamicValue copy() { return new BoldDefensePTCount(); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 5f0faa75d6..48cf4d368a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java @@ -89,7 +89,7 @@ class TargetPlayerCardsInHandCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new TargetPlayerCardsInHandCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/DynamicValue.java b/Mage/src/mage/abilities/dynamicvalue/DynamicValue.java index ef6713d20d..a6845a51e4 100644 --- a/Mage/src/mage/abilities/dynamicvalue/DynamicValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/DynamicValue.java @@ -7,6 +7,6 @@ import java.io.Serializable; public interface DynamicValue extends Serializable { int calculate(Game game, Ability sourceAbility); - DynamicValue clone(); + DynamicValue copy(); String getMessage(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/AuraAttachedCount.java b/Mage/src/mage/abilities/dynamicvalue/common/AuraAttachedCount.java index 3b856b44f2..97fe64af19 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/AuraAttachedCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/AuraAttachedCount.java @@ -72,7 +72,7 @@ public class AuraAttachedCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new AuraAttachedCount(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java index d44d065af4..f983e34e3a 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java @@ -46,7 +46,7 @@ public class CardsInAllGraveyardsCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CardsInAllGraveyardsCount(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java index ff147c5985..c1f1a066cd 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java @@ -43,7 +43,7 @@ public class CardsInControllerGraveyardCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CardsInControllerGraveyardCount(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java index 63358e4b36..af833f3815 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java @@ -18,7 +18,7 @@ public class CardsInControllerHandCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CardsInControllerHandCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ControllerLifeCount.java b/Mage/src/mage/abilities/dynamicvalue/common/ControllerLifeCount.java index 791a4d4458..c81113a4b2 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/ControllerLifeCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/ControllerLifeCount.java @@ -16,7 +16,7 @@ public class ControllerLifeCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new ControllerLifeCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java index 34458e8744..5ab4b192b0 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java @@ -35,7 +35,7 @@ public class CountersCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new CountersCount(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java b/Mage/src/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java index ed27688605..02631fdef5 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java @@ -28,7 +28,7 @@ public class DiscardCostCardConvertedMana implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new DiscardCostCardConvertedMana(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java b/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java index 81c8ac4e6f..20c5df35f3 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java @@ -49,7 +49,7 @@ public class DomainValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new DomainValue(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java b/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java index e97648f9e2..8fbfccad70 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java @@ -72,7 +72,7 @@ public class EquipmentAttachedCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new EquipmentAttachedCount(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java b/Mage/src/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java index 43877460be..83fc4fa01a 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java @@ -69,7 +69,7 @@ public class ExileFromHandCostCardConvertedMana implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new ExileFromHandCostCardConvertedMana(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/GetXValue.java b/Mage/src/mage/abilities/dynamicvalue/common/GetXValue.java index 27d36c3087..9579e04e3d 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/GetXValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/GetXValue.java @@ -47,7 +47,7 @@ public class GetXValue implements DynamicValue { } @Override - public GetXValue clone() { + public GetXValue copy() { return new GetXValue(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java b/Mage/src/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java index 3d28d65dc5..cb8f0e4fca 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java @@ -33,7 +33,7 @@ public class ManaTypeInManaPoolCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new ManaTypeInManaPoolCount(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ManacostVariableValue.java b/Mage/src/mage/abilities/dynamicvalue/common/ManacostVariableValue.java index bb4fa60d14..72ab9fa344 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/ManacostVariableValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/ManacostVariableValue.java @@ -11,7 +11,7 @@ public class ManacostVariableValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new ManacostVariableValue(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java b/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java index a7f887f8f0..5f70fe6f98 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java @@ -57,7 +57,7 @@ public class MultikickerCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new MultikickerCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java b/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java index cd0fd4a678..79459413d6 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java @@ -59,7 +59,7 @@ public class OpponentsLostLifeCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new OpponentsLostLifeCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java index d5b1ecff73..18bbcf44c5 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java @@ -38,7 +38,7 @@ public class PermanentsOnBattlefieldCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new PermanentsOnBattlefieldCount(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java b/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java index 71cb01559a..b68d05bbeb 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java @@ -28,7 +28,7 @@ public class SacrificeCostCreaturesPower implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new SacrificeCostCreaturesPower(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java b/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java index 02323bfb26..e97aec5905 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java @@ -28,7 +28,7 @@ public class SacrificeCostCreaturesToughness implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new SacrificeCostCreaturesToughness(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java b/Mage/src/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java index 505d831c5b..4773d7b7da 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java @@ -8,11 +8,11 @@ public class SignInversionDynamicValue implements DynamicValue { private DynamicValue value; public SignInversionDynamicValue(DynamicValue value) { - this.value = value.clone(); + this.value = value.copy(); } SignInversionDynamicValue(final SignInversionDynamicValue dynamicValue) { - this.value = dynamicValue.value.clone(); + this.value = dynamicValue.value.copy(); } @Override @@ -21,7 +21,7 @@ public class SignInversionDynamicValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new SignInversionDynamicValue(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java b/Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java index 4ae0371027..b8b35f33a3 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java @@ -23,7 +23,7 @@ public class SourcePermanentPowerCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new SourcePermanentPowerCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/StaticValue.java b/Mage/src/mage/abilities/dynamicvalue/common/StaticValue.java index e6384dcce9..f92336ea5a 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/StaticValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/StaticValue.java @@ -22,7 +22,7 @@ public class StaticValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new StaticValue(this); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SunburstCount.java b/Mage/src/mage/abilities/dynamicvalue/common/SunburstCount.java index 14ffe47ce5..b3e76851de 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/SunburstCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/SunburstCount.java @@ -73,7 +73,7 @@ public class SunburstCount implements DynamicValue{ } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new SunburstCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java b/Mage/src/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java index f41a700350..f2c7fc2a9a 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java @@ -48,7 +48,7 @@ public class TargetConvertedManaCost implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new TargetConvertedManaCost(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java b/Mage/src/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java index 3aa640d721..cfde5c69ca 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java @@ -53,7 +53,7 @@ public class TargetPermanentPowerCount implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new TargetPermanentPowerCount(); } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java b/Mage/src/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java index 008b83b57f..a1ea0b3bba 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java @@ -37,7 +37,7 @@ public class UrzaTerrainValue implements DynamicValue { } @Override - public DynamicValue clone() { + public DynamicValue copy() { return new UrzaTerrainValue(v); } diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java index 3eb96bba27..4f38199398 100644 --- a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java +++ b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java @@ -56,13 +56,13 @@ public class CreateTokenEffect extends OneShotEffect { public CreateTokenEffect(Token token, DynamicValue amount) { super(Outcome.PutCreatureInPlay); this.token = token; - this.amount = amount.clone(); + this.amount = amount.copy(); setText(); } public CreateTokenEffect(final CreateTokenEffect effect) { super(effect); - this.amount = effect.amount.clone(); + this.amount = effect.amount.copy(); this.token = effect.token.copy(); } diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java index 6d5382599f..0f85670e74 100644 --- a/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -27,7 +27,7 @@ public class CreateTokenTargetEffect extends OneShotEffect { public DamageTargetEffect(final DamageTargetEffect effect) { super(effect); - this.amount = effect.amount.clone(); + this.amount = effect.amount.copy(); this.preventable = effect.preventable; this.targetDescription = effect.targetDescription; } diff --git a/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java index ad795c5fe1..d27a18382a 100644 --- a/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java @@ -55,7 +55,7 @@ public class DiscardControllerEffect extends OneShotEffect { public DiscardTargetEffect(final DiscardTargetEffect effect) { super(effect); - this.amount = effect.amount.clone(); + this.amount = effect.amount.copy(); this.randomDiscard = effect.randomDiscard; } diff --git a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java index 9598ecb9da..7881ccdf19 100644 --- a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java @@ -50,13 +50,13 @@ public class DrawCardControllerEffect extends OneShotEffect { public DrawCardTargetEffect(DynamicValue amount) { super(Outcome.DrawCard); - this.amount = amount.clone(); + this.amount = amount.copy(); } public DrawCardTargetEffect(final DrawCardTargetEffect effect) { super(effect); - this.amount = effect.amount.clone(); + this.amount = effect.amount.copy(); } @Override diff --git a/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java b/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java index 5472b7068a..6ab4f05db5 100644 --- a/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java +++ b/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java @@ -51,7 +51,7 @@ public class DynamicManaEffect extends BasicManaEffect { public DynamicManaEffect(final DynamicManaEffect effect) { super(effect); this.computedMana = effect.computedMana.copy(); - this.amount = effect.amount.clone(); + this.amount = effect.amount.copy(); } @Override diff --git a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java index f25722de78..f2d9b39f0c 100644 --- a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java +++ b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java @@ -56,7 +56,7 @@ public class GainLifeEffect extends OneShotEffect { public GainLifeEffect(final GainLifeEffect effect) { super(effect); - this.life = effect.life.clone(); + this.life = effect.life.copy(); } @Override diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index 773fd8fe20..be5f65462d 100644 --- a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -73,7 +73,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff public LookLibraryAndPickControllerEffect(final LookLibraryAndPickControllerEffect effect) { super(effect); - this.numberToPick = effect.numberToPick.clone(); + this.numberToPick = effect.numberToPick.copy(); this.filter = effect.filter.copy(); this.revealPickedCards = effect.revealPickedCards; this.targetPickedCards = effect.targetPickedCards; diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java b/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java index 5f819f9ced..6d65e986f4 100644 --- a/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java @@ -91,7 +91,7 @@ public class LookLibraryControllerEffect extends OneShotEffect { public LoseLifeTargetEffect(final LoseLifeTargetEffect effect) { super(effect); - this.amount = effect.amount.clone(); + this.amount = effect.amount.copy(); } @Override diff --git a/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java index 783499e1b5..eb49287148 100644 --- a/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java @@ -58,7 +58,7 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect i public BoostSourceEffect(final BoostSourceEffect effect) { super(effect); - this.power = effect.power.clone(); - this.toughness = effect.toughness.clone(); + this.power = effect.power.copy(); + this.toughness = effect.toughness.copy(); this.lockedIn = effect.lockedIn; } diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostTargetEffect.java index aaac4fe716..f0de56fe72 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostTargetEffect.java @@ -72,8 +72,8 @@ public class BoostTargetEffect extends ContinuousEffectImpl { public BoostTargetEffect(final BoostTargetEffect effect) { super(effect); - this.power = effect.power.clone(); - this.toughness = effect.toughness.clone(); + this.power = effect.power.copy(); + this.toughness = effect.toughness.copy(); this.lockedIn = effect.lockedIn; }