From 0942e9140cfec5060adfeb6d944533ac05bf8ab7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 29 Oct 2014 10:19:32 +0100 Subject: [PATCH] * BecomesCreatureTargetEffect - Fixed a bug that type changing effects (e.g. 1st ability of Nissan Worldwaker) did wrongly always overwrite all subtypes. --- .../continious/BecomesCreatureTargetEffect.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java index 9793785326d..2563cdf7cd8 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureTargetEffect.java @@ -82,12 +82,19 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - permanent.getSubtype().clear(); - if (token.getSubtype().size() > 0) { - permanent.getSubtype().addAll(token.getSubtype()); - } if (type == null) { + permanent.getSubtype().clear(); + permanent.getSubtype().addAll(token.getSubtype()); permanent.getCardType().clear(); + } else { + if (token.getSubtype().size() > 0) { + for (String subtype :token.getSubtype()) { + if (!permanent.getSubtype().contains(subtype)) { + permanent.getSubtype().add(subtype); + } + } + + } } if (token.getCardType().size() > 0) { for (CardType t : token.getCardType()) {