From e67a33eaaa5e1c1f46ba268e02254a087b0f2ec3 Mon Sep 17 00:00:00 2001 From: kaelima Date: Wed, 7 Sep 2011 15:11:12 +0200 Subject: Revert "Core/GameObjects: Fix possible crash in GameObject::SetDestructibleState." This reverts commit 85c7a916a0efcbadaabfa28c1424ae1360ba4142. Ty Shauren. --- src/server/game/Entities/GameObject/GameObject.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index d3d95abce14..83ece2eda31 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1791,12 +1791,10 @@ void GameObject::SetDestructibleState(GameObjectDestructibleState state, Player* case GO_DESTRUCTIBLE_DAMAGED: { EventInform(m_goInfo->building.damagedEvent); + sScriptMgr->OnGameObjectDamaged(this, eventInvoker); if (eventInvoker) - { - sScriptMgr->OnGameObjectDamaged(this, eventInvoker); if (Battleground* bg = eventInvoker->GetBattleground()) bg->EventPlayerDamagedGO(eventInvoker, this, m_goInfo->building.damagedEvent); - } RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED); @@ -1820,10 +1818,10 @@ void GameObject::SetDestructibleState(GameObjectDestructibleState state, Player* } case GO_DESTRUCTIBLE_DESTROYED: { + sScriptMgr->OnGameObjectDestroyed(this, eventInvoker); EventInform(m_goInfo->building.destroyedEvent); if (eventInvoker) { - sScriptMgr->OnGameObjectDestroyed(this, eventInvoker); if (Battleground* bg = eventInvoker->GetBattleground()) { bg->EventPlayerDamagedGO(eventInvoker, this, m_goInfo->building.destroyedEvent); -- cgit v1.2.3