diff --git a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java index 777a588ddfe..f2f9e9ba8e4 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java +++ b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java @@ -107,7 +107,7 @@ class AnimateArtifactContinuousEffect extends ContinuousEffectImpl { Permanent permanent = game.getPermanent(enchantment.getAttachedTo()); if (permanent != null && !permanent.isCreature()) { if (sublayer == SubLayer.NA) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); permanent.getPower().setValue(permanent.getConvertedManaCost()); permanent.getToughness().setValue(permanent.getConvertedManaCost()); } diff --git a/Mage.Sets/src/mage/cards/c/ChimericCoils.java b/Mage.Sets/src/mage/cards/c/ChimericCoils.java index ea3da2d9f44..9d00a26bc0d 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericCoils.java +++ b/Mage.Sets/src/mage/cards/c/ChimericCoils.java @@ -90,7 +90,7 @@ class ChimericCoilsEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); permanent.getSubtype(game).add("Construct"); } break; diff --git a/Mage.Sets/src/mage/cards/c/ChimericStaff.java b/Mage.Sets/src/mage/cards/c/ChimericStaff.java index 69122831af6..03cf21438f8 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericStaff.java +++ b/Mage.Sets/src/mage/cards/c/ChimericStaff.java @@ -85,7 +85,7 @@ class ChimericStaffEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); permanent.getSubtype(game).add("Construct"); } break; diff --git a/Mage.Sets/src/mage/cards/e/EnchantedEvening.java b/Mage.Sets/src/mage/cards/e/EnchantedEvening.java index d4b5052d4ed..f5d8165de5a 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantedEvening.java +++ b/Mage.Sets/src/mage/cards/e/EnchantedEvening.java @@ -88,7 +88,7 @@ public class EnchantedEvening extends CardImpl { public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, game)) { if (permanent != null && !permanent.getCardType().contains(addedCardType)) { - permanent.getCardType().add(addedCardType); + permanent.addCardType(addedCardType); } } return true; diff --git a/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java b/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java index f0e561f4325..9e260a8eb72 100644 --- a/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java +++ b/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java @@ -85,6 +85,6 @@ class CamaridToken extends Token { this.getToughness().modifyBaseValue(1); this.color.setBlue(true); this.getSubtype(null).add("Camarid"); - this.getCardType().add(CardType.CREATURE); + this.addCardType(CardType.CREATURE); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java b/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java index 1b3f3cf3eee..1afecae365a 100644 --- a/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java +++ b/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java @@ -130,7 +130,7 @@ class BecomesColorlessLandEffect extends ContinuousEffectImpl { case TypeChangingEffects_4: boolean isLand = permanent.isLand(); permanent.getCardType().clear(); - permanent.getCardType().add(CardType.LAND); + permanent.addCardType(CardType.LAND); if (!isLand) { permanent.getSubtype(game).clear(); } diff --git a/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java b/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java index 78e28e09b8b..f5cef06c098 100644 --- a/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java +++ b/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java @@ -80,7 +80,7 @@ class CatWarriorToken extends Token { this.color.setGreen(true); this.getSubtype(null).add("Cat"); this.getSubtype(null).add("Warrior"); - this.getCardType().add(CardType.CREATURE); + this.addCardType(CardType.CREATURE); this.addAbility(new ForestwalkAbility()); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java b/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java index 2e93745f475..ffc7b7177ae 100644 --- a/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java +++ b/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java @@ -117,6 +117,6 @@ class RagavanToken extends Token { this.getToughness().modifyBaseValue(1); this.color.setRed(true); this.getSubtype(null).add("Monkey"); - this.getCardType().add(CardType.CREATURE); + this.addCardType(CardType.CREATURE); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java index 759fe434d39..2ff48d34422 100644 --- a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java +++ b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java @@ -110,7 +110,7 @@ class KarnSilverGolemEffect extends ContinuousEffectImpl { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { if (!artifact.isCreature()) { - artifact.getCardType().add(CardType.CREATURE); + artifact.addCardType(CardType.CREATURE); } } break; diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java index 117bc4960bf..f3063ea85bc 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java @@ -28,8 +28,6 @@ package mage.cards.l; -import java.util.Iterator; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -39,12 +37,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.game.Game; @@ -56,6 +49,9 @@ import mage.game.permanent.token.Token; import mage.target.Target; import mage.target.common.TargetLandPermanent; +import java.util.Iterator; +import java.util.UUID; + /** * * @author Loki @@ -138,7 +134,7 @@ class LiegeOfTheTangleEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - perm.getCardType().addAll(token.getCardType()); + perm.addCardTypes(token.getCardType()); perm.getSubtype(game).addAll(token.getSubtype(game)); } break; diff --git a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java index f3024e3fb3c..dc0708ef3dc 100644 --- a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java +++ b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java @@ -100,13 +100,13 @@ class LifeAndLimbEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (!permanent.isCreature()) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } if (!permanent.getSubtype(game).contains("Saproling")) { permanent.getSubtype(game).add("Saproling"); } if (!permanent.isLand()) { - permanent.getCardType().add(CardType.LAND); + permanent.addCardType(CardType.LAND); } if (!permanent.getSubtype(game).contains("Forest")) { permanent.getSubtype(game).add("Forest"); diff --git a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java index 6a2c374c5fb..fa21b32eb24 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java @@ -97,7 +97,7 @@ class MarchOfTheMachinesEffect extends ContinuousEffectImpl { for(Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, game)){ if(permanent != null){ affectedObjectList.add(new MageObjectReference(permanent, game)); - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } } } diff --git a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java index 72f82fc9f33..b55ace064d7 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java @@ -83,7 +83,7 @@ class PermanentsAreArtifactsEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { for (Permanent perm : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { - perm.getCardType().add(CardType.ARTIFACT); + perm.addCardType(CardType.ARTIFACT); } return true; } diff --git a/Mage.Sets/src/mage/cards/n/NaturalAffinity.java b/Mage.Sets/src/mage/cards/n/NaturalAffinity.java index e783d374601..cfae01cb44c 100644 --- a/Mage.Sets/src/mage/cards/n/NaturalAffinity.java +++ b/Mage.Sets/src/mage/cards/n/NaturalAffinity.java @@ -99,7 +99,7 @@ class BecomesCreatureAllEffect extends ContinuousEffectImpl { for (Iterator it = affectedObjectList.iterator(); it.hasNext();) { Permanent permanent = it.next().getPermanent(game); if (permanent != null) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } else { it.remove(); } diff --git a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java index cd16fdb1f98..02ad58399da 100644 --- a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java +++ b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java @@ -132,7 +132,7 @@ class NissaSageAnimistToken extends Token { this.getToughness().modifyBaseValue(4); this.color.setGreen(true); this.getSubtype(null).add("Elemental"); - this.getCardType().add(CardType.CREATURE); + this.addCardType(CardType.CREATURE); } } @@ -160,7 +160,7 @@ class NissaSageAnimistMinusSevenEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (!permanent.isCreature()) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } if (!permanent.getSubtype(game).contains("Elemental")) { permanent.getSubtype(game).add("Elemental"); diff --git a/Mage.Sets/src/mage/cards/o/Opalescence.java b/Mage.Sets/src/mage/cards/o/Opalescence.java index d16722e4c3f..5f75871939d 100644 --- a/Mage.Sets/src/mage/cards/o/Opalescence.java +++ b/Mage.Sets/src/mage/cards/o/Opalescence.java @@ -109,7 +109,7 @@ class OpalescenceEffect extends ContinuousEffectImpl { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { if (!permanent.isCreature()) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } } break; diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java b/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java index cb5b18d275c..805cda4b1c2 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java @@ -76,7 +76,7 @@ public class PhyrexianMetamorph extends CardImpl { @Override public boolean apply(Game game, MageObject mageObject) { if (!mageObject.isArtifact()) { - mageObject.getCardType().add(CardType.ARTIFACT); + mageObject.addCardType(CardType.ARTIFACT); } return true; } diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java b/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java index c89413f0b28..38f49b9315d 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java @@ -118,7 +118,7 @@ class SarkhanTheDragonspeakerEffect extends ContinuousEffectImpl { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { permanent.getCardType().clear(); - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); permanent.getSubtype(game).clear(); permanent.getSubtype(game).add("Dragon"); permanent.getSuperType().clear(); diff --git a/Mage.Sets/src/mage/cards/s/SlumberingTora.java b/Mage.Sets/src/mage/cards/s/SlumberingTora.java index c28b823d00e..a6166c594d9 100644 --- a/Mage.Sets/src/mage/cards/s/SlumberingTora.java +++ b/Mage.Sets/src/mage/cards/s/SlumberingTora.java @@ -98,7 +98,7 @@ public class SlumberingTora extends CardImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); permanent.getSubtype(game).add("Cat"); } break; diff --git a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java index cd535c6b33b..cb9df596903 100644 --- a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java +++ b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java @@ -119,7 +119,7 @@ class BecomesColorlessForestLandEffect extends ContinuousEffectImpl { break; case TypeChangingEffects_4: permanent.getCardType().clear(); - permanent.getCardType().add(CardType.LAND); + permanent.addCardType(CardType.LAND); permanent.getSubtype(game).clear(); permanent.getSubtype(game).add("Forest"); break; diff --git a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java index 39a144b3fc1..c9a00d3bca7 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java @@ -133,7 +133,7 @@ class StarfieldOfNyxEffect extends ContinuousEffectImpl { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { if (!permanent.isCreature()) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } } break; diff --git a/Mage.Sets/src/mage/cards/s/StartYourEngines.java b/Mage.Sets/src/mage/cards/s/StartYourEngines.java index d1edf3c87ea..d7232d26c69 100644 --- a/Mage.Sets/src/mage/cards/s/StartYourEngines.java +++ b/Mage.Sets/src/mage/cards/s/StartYourEngines.java @@ -91,8 +91,8 @@ class StartYourEnginesEffect extends ContinuousEffectImpl { for (Permanent permanent : game.getBattlefield().getAllActivePermanents(source.getControllerId())) { if (permanent != null && permanent.getSubtype(game).contains("Vehicle")) { if (sublayer == SubLayer.NA) { - permanent.getCardType().add(CardType.ARTIFACT); - permanent.getCardType().add(CardType.CREATURE);// TODO: Chcek if giving CREATURE Type is correct + permanent.addCardType(CardType.ARTIFACT); + permanent.addCardType(CardType.CREATURE);// TODO: Chcek if giving CREATURE Type is correct } } } diff --git a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java index 845841fc764..4551b656b8f 100644 --- a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java @@ -121,7 +121,7 @@ class SydriGalvanicGeniusEffect extends ContinuousEffectImpl { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { if (!artifact.isCreature()) { - artifact.getCardType().add(CardType.CREATURE); + artifact.addCardType(CardType.CREATURE); } } break; diff --git a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java index 752516f6275..4e864b2520e 100644 --- a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java +++ b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java @@ -112,7 +112,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { - permanent.getCardType().add(t); + permanent.addCardType(t); } } } diff --git a/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java b/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java index e70262927ba..1312c47b679 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java @@ -160,10 +160,10 @@ class TezzeretTheSeekerEffect3 extends ContinuousEffectImpl { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { if (!permanent.isArtifact()) { - permanent.getCardType().add(CardType.ARTIFACT); + permanent.addCardType(CardType.ARTIFACT); } if (!permanent.isCreature()) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } permanent.getSubtype(game).clear(); } diff --git a/Mage.Sets/src/mage/cards/t/TitaniasSong.java b/Mage.Sets/src/mage/cards/t/TitaniasSong.java index 97480346c8b..a4a04855809 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniasSong.java +++ b/Mage.Sets/src/mage/cards/t/TitaniasSong.java @@ -100,7 +100,7 @@ class TitaniasSongEffect extends ContinuousEffectImpl { for(Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, game)){ if(permanent != null){ affectedObjectList.add(new MageObjectReference(permanent, game)); - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } } } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java index 0198ed05f52..f62aeb67db9 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java @@ -104,7 +104,7 @@ class VolrathsShapeshifterEffect extends ContinuousEffectImpl { permanent.setName(card.getName()); for (CardType type : card.getCardType()) { - permanent.getCardType().add(type); + permanent.addCardType(type); } permanent.getSubtype(game).clear(); diff --git a/Mage.Sets/src/mage/cards/w/WireflyHive.java b/Mage.Sets/src/mage/cards/w/WireflyHive.java index 46539044fb0..a57ec8e7668 100644 --- a/Mage.Sets/src/mage/cards/w/WireflyHive.java +++ b/Mage.Sets/src/mage/cards/w/WireflyHive.java @@ -79,7 +79,7 @@ class WireflyToken extends Token { this.getPower().modifyBaseValue(2); this.getToughness().modifyBaseValue(2); this.getSubtype(null).add("Insect"); - this.getCardType().add(CardType.ARTIFACT); - this.getCardType().add(CardType.CREATURE); + this.addCardType(CardType.ARTIFACT); + this.addCardType(CardType.CREATURE); } } diff --git a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java index 2198066f5f8..62e232b9583 100644 --- a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java +++ b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java @@ -145,7 +145,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl { UUID permanentId = targetPointer.getFirst(game, source); Permanent permanent = game.getPermanentOrLKIBattlefield(permanentId); if(permanent != null){ - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } } break; diff --git a/Mage.Sets/src/mage/sets/Amonkhet.java b/Mage.Sets/src/mage/sets/Amonkhet.java index 8d87bbae9f4..e4a6f553245 100644 --- a/Mage.Sets/src/mage/sets/Amonkhet.java +++ b/Mage.Sets/src/mage/sets/Amonkhet.java @@ -27,8 +27,6 @@ */ package mage.sets; -import java.util.ArrayList; -import java.util.List; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; @@ -37,6 +35,9 @@ import mage.cards.repository.CardRepository; import mage.constants.Rarity; import mage.constants.SetType; +import java.util.ArrayList; +import java.util.List; + /** * * @author fireshoes @@ -105,7 +106,7 @@ public class Amonkhet extends ExpansionSet { cards.add(new SetCardInfo("Island", 258, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Island", 259, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Island", 260, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Kefnet the Mindful", 59, Rarity.MYTHIC, mage.cards.k.KefnetTheMindful.class)); + // cards.add(new SetCardInfo("Kefnet the Mindful", 59, Rarity.MYTHIC, mage.cards.k.KefnetTheMindful.class)); cards.add(new SetCardInfo("Kefnet's Monument", 231, Rarity.UNCOMMON, mage.cards.k.KefnetsMonument.class)); cards.add(new SetCardInfo("Lay Bare the Heart", 96, Rarity.UNCOMMON, mage.cards.l.LayBareTheHeart.class)); cards.add(new SetCardInfo("Liliana, Death Wielder", 274, Rarity.MYTHIC, mage.cards.l.LilianaDeathWielder.class)); diff --git a/Mage/src/main/java/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java index 3ee4a3e2d0d..370b55e1760 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -138,7 +138,7 @@ public interface MageObject extends MageItem, Serializable { } default void addCardType(CardType cardType) { - getCardType().add(cardType); + addCardType(cardType); } /** @@ -186,4 +186,7 @@ public interface MageObject extends MageItem, Serializable { return false; } + default void addCardTypes(EnumSet cardType){ + getCardType().addAll(cardType); + } } diff --git a/Mage/src/main/java/mage/abilities/common/LicidAbility.java b/Mage/src/main/java/mage/abilities/common/LicidAbility.java index 1b8381c8bbb..f9db3f24397 100644 --- a/Mage/src/main/java/mage/abilities/common/LicidAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LicidAbility.java @@ -139,7 +139,7 @@ class LicidContinuousEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: licid.getCardType().clear(); - licid.getCardType().add(CardType.ENCHANTMENT); + licid.addCardType(CardType.ENCHANTMENT); licid.getSubtype(game).clear(); licid.getSubtype(game).add("Aura"); break; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java index 3ad75b5da4d..c70164c8573 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java @@ -122,7 +122,7 @@ public class CopyEffect extends ContinuousEffectImpl { permanent.getManaCost().add(copyFromObject.getManaCost()); permanent.getCardType().clear(); for (CardType type : copyFromObject.getCardType()) { - permanent.getCardType().add(type); + permanent.addCardType(type); } permanent.getSubtype(game).clear(); for (String type : copyFromObject.getSubtype(game)) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java index 3aa3ba8a9e8..026854d6ef4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java @@ -28,7 +28,7 @@ public class CopyTokenEffect extends ContinuousEffectImpl { permanent.getColor(game).setColor(token.getColor(game)); permanent.getCardType().clear(); for (CardType type: token.getCardType()) { - permanent.getCardType().add(type); + permanent.addCardType(type); } permanent.getSubtype(game).clear(); for (String type: token.getSubtype(game)) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java index 8b38820d92d..9db4c7574ba 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java @@ -190,10 +190,10 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { CardUtil.copyTo(token).from(copyFrom); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer) applier.apply(game, token); if (becomesArtifact) { - token.getCardType().add(CardType.ARTIFACT); + token.addCardType(CardType.ARTIFACT); } if (additionalCardType != null && !token.getCardType().contains(additionalCardType)) { - token.getCardType().add(additionalCardType); + token.addCardType(additionalCardType); } if (gainsHaste) { token.addAbility(HasteAbility.getInstance()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java index 2886bdf363c..360091fca26 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java @@ -60,7 +60,7 @@ public class AddCardTypeAttachedEffect extends ContinuousEffectImpl { if (equipment != null && equipment.getAttachedTo() != null) { Permanent target = game.getPermanent(equipment.getAttachedTo()); if (target != null && !target.getCardType().contains(addedCardType)) - target.getCardType().add(addedCardType); + target.addCardType(addedCardType); } return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java index 83ac0c1e94c..6a2e18f61d2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java @@ -66,7 +66,7 @@ public class AddCardTypeSourceEffect extends ContinuousEffectImpl { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null && affectedObjectList.contains(new MageObjectReference(permanent, game))) { if (!permanent.getCardType().contains(addedCardType)) { - permanent.getCardType().add(addedCardType); + permanent.addCardType(addedCardType); } return true; } else if (this.getDuration() == Duration.Custom) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java index 56981a038f1..33c325bdc40 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java @@ -69,7 +69,7 @@ public class AddCardTypeTargetEffect extends ContinuousEffectImpl { Permanent target = game.getPermanent(targetId); if (target != null) { if (!target.getCardType().contains(addedCardType)) { - target.getCardType().add(addedCardType); + target.addCardType(addedCardType); } result = true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java index 5ada0f6b1c1..c559f5cd5cc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java @@ -145,7 +145,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl { case TypeChangingEffects_4: // Attention: Cards like Unstable Frontier that use this class do not give the "Basic" supertype to the target if (!land.isLand()) { - land.getCardType().add(CardType.LAND); + land.addCardType(CardType.LAND); } if (loseOther) { // 305.7 Note that this doesn't remove any abilities that were granted to the land by other effects diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java index d7758dc6fef..f6f796c25fd 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java @@ -79,7 +79,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl { if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { - permanent.getCardType().add(t); + permanent.addCardType(t); } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java index ca214044a8a..b7dfb71df61 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java @@ -93,7 +93,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { break; } for (CardType t : token.getCardType()) { - permanent.getCardType().add(t); + permanent.addCardType(t); } // sub type diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java index 1c9cccfed76..169ee278e37 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java @@ -109,7 +109,7 @@ public class BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect extends Co break; } for (CardType cardType : token.getCardType()) { - permanentAttachedTo.getCardType().add(cardType); + permanentAttachedTo.addCardType(cardType); } // sub type diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java index 51ad5a94d80..a47f8d0c773 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java @@ -116,7 +116,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { - permanent.getCardType().add(t); + permanent.addCardType(t); } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java index 838014740d7..8d12dd02895 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java @@ -103,7 +103,7 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl { if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { - permanent.getCardType().add(t); + permanent.addCardType(t); } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java index 88e921758da..6584faf92a9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java @@ -109,7 +109,7 @@ public class BecomesFaceDownCreatureAllEffect extends ContinuousEffectImpl imple permanent.setName(""); permanent.getSuperType().clear(); permanent.getCardType().clear(); - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); permanent.getSubtype(game).clear(); permanent.getManaCost().clear(); break; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java index f71868632ff..e5747882b4d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java @@ -165,7 +165,7 @@ public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implemen permanent.setName(""); permanent.getSuperType().clear(); permanent.getCardType().clear(); - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); permanent.getSubtype(game).clear(); break; case ColorChangingEffects_5: diff --git a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java index a69c5aa5387..0ae699c7114 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java @@ -151,12 +151,12 @@ public class BestowAbility extends SpellAbility { if (basicObject != null) { basicObject.getSubtype(null).remove("Aura"); if (!basicObject.isCreature()) { - basicObject.getCardType().add(CardType.CREATURE); + basicObject.addCardType(CardType.CREATURE); } } permanent.getSubtype(null).remove("Aura"); if (!permanent.isCreature()) { - permanent.getCardType().add(CardType.CREATURE); + permanent.addCardType(CardType.CREATURE); } } diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java index 587aa53c93e..555fb72c33c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -299,7 +299,7 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost mageObject.getColor(null).setColor(new ObjectColor()); mageObject.setName(""); mageObject.getCardType().clear(); - mageObject.getCardType().add(CardType.CREATURE); + mageObject.addCardType(CardType.CREATURE); mageObject.getSubtype(null).clear(); mageObject.getSuperType().clear(); mageObject.getManaCost().clear(); diff --git a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java index e365e6dd287..c769de9ca0a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java @@ -77,7 +77,7 @@ public class TransformAbility extends SimpleStaticAbility { permanent.getManaCost().add(sourceCard.getManaCost()); permanent.getCardType().clear(); for (CardType type : sourceCard.getCardType()) { - permanent.getCardType().add(type); + permanent.addCardType(type); } permanent.getSubtype(game).clear(); for (String type : sourceCard.getSubtype(game)) { diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java index e71ea49ed98..863302c53fa 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -253,14 +253,14 @@ public class Spell extends StackObjImpl implements Card { Permanent permanent = game.getPermanent(card.getId()); if (permanent != null && permanent instanceof PermanentCard) { permanent.setSpellAbility(ability); // otherwise spell ability without bestow will be set - card.getCardType().add(CardType.CREATURE); + card.addCardType(CardType.CREATURE); card.getSubtype(game).remove("Aura"); } } return ability.resolve(game); } if (bestow) { - card.getCardType().add(CardType.CREATURE); + card.addCardType(CardType.CREATURE); } return false; } @@ -270,7 +270,7 @@ public class Spell extends StackObjImpl implements Card { if (controller.moveCards(card, Zone.BATTLEFIELD, ability, game, false, faceDown, false, null)) { Permanent permanent = game.getPermanent(card.getId()); if (permanent != null && permanent instanceof PermanentCard) { - ((PermanentCard) permanent).getCard().getCardType().add(CardType.CREATURE); + ((PermanentCard) permanent).getCard().addCardType(CardType.CREATURE); ((PermanentCard) permanent).getCard().getSubtype(game).remove("Aura"); return true; } diff --git a/Mage/src/main/java/mage/util/functions/CardTypeApplier.java b/Mage/src/main/java/mage/util/functions/CardTypeApplier.java index 4e6ec1719e4..00409a1cf65 100644 --- a/Mage/src/main/java/mage/util/functions/CardTypeApplier.java +++ b/Mage/src/main/java/mage/util/functions/CardTypeApplier.java @@ -47,7 +47,7 @@ public class CardTypeApplier extends ApplyToPermanent { @Override public boolean apply(Game game, Permanent permanent) { if (!permanent.getCardType().contains(cardType)) { - permanent.getCardType().add(cardType); + permanent.addCardType(cardType); } return true; } @@ -55,7 +55,7 @@ public class CardTypeApplier extends ApplyToPermanent { @Override public boolean apply(Game game, MageObject mageObject) { if (!mageObject.getCardType().contains(cardType)) { - mageObject.getCardType().add(cardType); + mageObject.addCardType(cardType); } return true; } diff --git a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java index 373e573f8f8..2d1ad62b7fc 100644 --- a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java +++ b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java @@ -93,7 +93,7 @@ public class CopyTokenFunction implements Function { target.getManaCost().add(sourceObj.getManaCost()); target.getCardType().clear(); for (CardType type : sourceObj.getCardType()) { - target.getCardType().add(type); + target.addCardType(type); } target.getSubtype(null).clear(); for (String type : sourceObj.getSubtype(null)) {