*Merge.

--HG--
branch : trunk

1 files changed, 4 insertions, 3 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 5c6c7e0566b..bc8105abcc1 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1657,7 +1657,8 @@ void Creature::setDeathState(DeathState s)
     {
         SetUInt64Value (UNIT_FIELD_TARGET,0);               // remove target selection in any cases (can be set at aura remove in Unit::setDeathState)
         SetUInt32Value(UNIT_NPC_FLAGS, 0);
-        setActive(false);
+        //if(!isPet())
+            setActive(false);
 
         if(!isPet() && GetCreatureInfo()->SkinLootId)
             if ( LootTemplates_Skinning.HaveLootFor(GetCreatureInfo()->SkinLootId) )
@@ -1670,8 +1671,8 @@ void Creature::setDeathState(DeathState s)
     }
     if(s == JUST_ALIVED)
     {
-        if(isPet())
-            setActive(true);
+        //if(isPet())
+        //    setActive(true);
         SetHealth(GetMaxHealth());
         SetLootRecipient(NULL);
         Unit::setDeathState(ALIVE);