From 4ce652efe54d889408ed092be8d871aebe9006b3 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 8 Nov 2014 17:41:57 +0100 Subject: [PATCH] * Fixed shares subtype check. --- .../src/mage/sets/championsofkamigawa/KondasBanner.java | 2 +- Mage/src/mage/util/CardUtil.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java index 722cf231718..dda94696fb3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java @@ -117,7 +117,7 @@ class KondasBannerTypeBoostEffect extends BoostAllEffect { Permanent equipedCreature = game.getPermanent(equipment.getAttachedTo()); if (equipedCreature != null) { for (Permanent perm: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - if (CardUtil.shareSubtypes(perm, equipedCreature) || perm.getAbilities().contains(ChangelingAbility.getInstance())) { + if (CardUtil.shareSubtypes(perm, equipedCreature)) { if (!this.affectedObjectsSet || objects.contains(perm.getId())) { perm.addPower(power.calculate(game, source, this)); perm.addToughness(toughness.calculate(game, source, this)); diff --git a/Mage/src/mage/util/CardUtil.java b/Mage/src/mage/util/CardUtil.java index 2cd98e0b4ce..e0d022ee71d 100644 --- a/Mage/src/mage/util/CardUtil.java +++ b/Mage/src/mage/util/CardUtil.java @@ -47,6 +47,7 @@ import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.VariableManaCost; +import mage.abilities.keyword.ChangelingAbility; import mage.cards.Card; import mage.cards.SplitCard; import mage.constants.CardType; @@ -100,6 +101,14 @@ public class CardUtil { throw new IllegalArgumentException("Params can't be null"); } + if (card1.getCardType().contains(CardType.CREATURE) && card2.getCardType().contains(CardType.CREATURE)) { + if (card1.getAbilities().contains(ChangelingAbility.getInstance()) || + card1.getSubtype().contains(ChangelingAbility.ALL_CREATURE_TYPE) || + card2.getAbilities().contains(ChangelingAbility.getInstance()) || + card2.getSubtype().contains(ChangelingAbility.ALL_CREATURE_TYPE)) { + return true; + } + } for (String subtype : card1.getSubtype()) { if (card2.getSubtype().contains(subtype)) { return true;