*Merge.

--HG-- branch : trunk
2009-02-24 21:14:00 -06:00
parent 65a933c6c1 8770a90bc6
commit 5fda499266
10 changed files with 244 additions and 379 deletions
@@ -1670,6 +1670,8 @@ void Creature::setDeathState(DeathState s)
    }
    if(s == JUST_ALIVED)
    {
+        if(isPet())
+            setActive(true);
        SetHealth(GetMaxHealth());
        SetLootRecipient(NULL);
        Unit::setDeathState(ALIVE);