josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/GameObjects: Fix possible crash in GameObject::SetDestructibleState.

Browse Source
This commit is contained in:
kaelima
2011-09-06 23:56:55 +02:00
parent 152f446c60
commit 85c7a916a0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/GameObject/GameObject.cpp
+5 -2
View File
@@ -1791,10 +1791,13 @@ void GameObject::SetDestructibleState(GameObjectDestructibleState state, Player*
case GO_DESTRUCTIBLE_DAMAGED: case GO_DESTRUCTIBLE_DAMAGED:
{ {
EventInform(m_goInfo->building.damagedEvent); EventInform(m_goInfo->building.damagedEvent);
sScriptMgr->OnGameObjectDamaged(this, eventInvoker);
if (eventInvoker) if (eventInvoker)
{
sScriptMgr->OnGameObjectDamaged(this, eventInvoker);
if (Battleground* bg = eventInvoker->GetBattleground()) if (Battleground* bg = eventInvoker->GetBattleground())
bg->EventPlayerDamagedGO(eventInvoker, this, m_goInfo->building.damagedEvent); bg->EventPlayerDamagedGO(eventInvoker, this, m_goInfo->building.damagedEvent);
}
RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED);
SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED); SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED);
@@ -1818,10 +1821,10 @@ void GameObject::SetDestructibleState(GameObjectDestructibleState state, Player*
} }
case GO_DESTRUCTIBLE_DESTROYED: case GO_DESTRUCTIBLE_DESTROYED:
{ {
sScriptMgr->OnGameObjectDestroyed(this, eventInvoker);
EventInform(m_goInfo->building.destroyedEvent); EventInform(m_goInfo->building.destroyedEvent);
if (eventInvoker) if (eventInvoker)
{ {
sScriptMgr->OnGameObjectDestroyed(this, eventInvoker);
if (Battleground* bg = eventInvoker->GetBattleground()) if (Battleground* bg = eventInvoker->GetBattleground())
{ {
bg->EventPlayerDamagedGO(eventInvoker, this, m_goInfo->building.destroyedEvent); bg->EventPlayerDamagedGO(eventInvoker, this, m_goInfo->building.destroyedEvent);