Merge pull request #16248 from elecyb/destroyAnimation

Core/Entities: Show destroy animation for creatures and totems.
This commit is contained in:
Kittnz committed 2016-01-12 22:38:00 +01:00
commit eeb72994ba
2 files changed
+12 -1

No files matched your search

+8 -1
View File
@@ -2426,7 +2426,14 @@ void WorldObject::DestroyForNearbyPlayers()
if (isType(TYPEMASK_UNIT) && ToUnit()->GetCharmerGUID() == player->GetGUID()) /// @todo this is for puppet
continue;
DestroyForPlayer(player);
if (GetTypeId() == TYPEID_UNIT)
{
// at remove from world (destroy) show kill animation
DestroyForPlayer(player, ToUnit()->IsDuringRemoveFromWorld() && ToCreature()->isDead());
}
else
DestroyForPlayer(player);
player->m_clientGUIDs.erase(GetGUID());
}
}
+4
View File
@@ -142,6 +142,10 @@ void Totem::UnSummon(uint32 msTime)
}
}
// any totem unsummon look like as totem kill, req. for proper animation
if (IsAlive())
setDeathState(DEAD);
AddObjectToRemoveList();
}