Core/Scripts: Fix a logic fail that overriden the script of an entity…

… that changed entry
This commit is contained in:
Aokromes committed 2017-04-01 07:11:25 +02:00
1 parent 26f8770385
commit 2f1d6d5597
3 files changed
+4 -6

No files matched your search

@@ -1948,7 +1948,8 @@ void GameObject::EventInform(uint32 eventId, WorldObject* invoker /*= nullptr*/)
uint32 GameObject::GetScriptId() const
{
if (GameObjectData const* gameObjectData = GetGOData())
return gameObjectData->ScriptId;
if (uint32 scriptId = gameObjectData->ScriptId)
return scriptId;
return GetGOInfo()->ScriptId;
}