From f77576b62cdd30d4d0ca891e6ddb808b04ead3f1 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 7 Oct 2013 14:16:37 +0200
Subject: [PATCH] * Bestow - while used as Aura, other subtypes are removed.
 Theros gods lose subtype god while beeing not a creature.

---
 .../mage/sets/theros/ThassaGodOfTheSea.java   |  1 -
 .../LoseCreatureTypeSourceEffect.java         |  1 +
 .../mage/abilities/keyword/BestowAbility.java | 20 ++++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java b/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java
index 434537189d6..359a820569c 100644
--- a/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java
+++ b/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java
@@ -48,7 +48,6 @@ import mage.constants.ManaType;
 import mage.constants.Rarity;
 import mage.constants.TargetController;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
 import mage.target.common.TargetControlledCreaturePermanent;
 
 /**
diff --git a/Mage/src/mage/abilities/effects/common/continious/LoseCreatureTypeSourceEffect.java b/Mage/src/mage/abilities/effects/common/continious/LoseCreatureTypeSourceEffect.java
index 852a3213dd8..d7471e8efab 100644
--- a/Mage/src/mage/abilities/effects/common/continious/LoseCreatureTypeSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/LoseCreatureTypeSourceEffect.java
@@ -78,6 +78,7 @@ public class LoseCreatureTypeSourceEffect extends ContinuousEffectImpl<LoseCreat
                 case TypeChangingEffects_4:
                     if (sublayer == SubLayer.NA) {
                         permanent.getCardType().remove(CardType.CREATURE);
+                        permanent.getSubtype().clear();
                     }
                     break;
             }
diff --git a/Mage/src/mage/abilities/keyword/BestowAbility.java b/Mage/src/mage/abilities/keyword/BestowAbility.java
index 2c0904ba0bc..a672b32924c 100644
--- a/Mage/src/mage/abilities/keyword/BestowAbility.java
+++ b/Mage/src/mage/abilities/keyword/BestowAbility.java
@@ -167,16 +167,18 @@ class BestowTypeChangingEffect extends ContinuousEffectImpl<BestowTypeChangingEf
         if (permanent != null) {
             switch (layer) {
                 case TypeChangingEffects_4:
-                    if (permanent.getAttachedTo() == null) {
-                        if (permanent.getSubtype().contains("Aura")) {
-                            permanent.getSubtype().remove("Aura");
-                        }
-                    } else {
-                        if (sublayer == SubLayer.NA) {
+                    if (sublayer == SubLayer.NA) {
+                        if (permanent.getAttachedTo() == null) {
+                            if (permanent.getSubtype().contains("Aura")) {
+                                permanent.getSubtype().remove("Aura");
+                            }
+                        } else {
                             permanent.getCardType().remove(CardType.CREATURE);
-                        }
-                        if (!permanent.getSubtype().contains("Aura")) {
-                            permanent.getSubtype().add("Aura");
+                            permanent.getSubtype().clear();
+                            if (!permanent.getSubtype().contains("Aura")) {
+
+                                permanent.getSubtype().add("Aura");
+                            }
                         }
                     }
                     break;