Merge branch 'master' into Playerbot

2022-03-22 10:53:26 -06:00
parent db71f4739c 77f13636b7
commit d4062269c8
2 changed files with 4 additions and 2 deletions
@@ -2142,7 +2142,8 @@ void GameObject::EventInform(uint32 eventId)
 uint32 GameObject::GetScriptId() const
 {
    if (GameObjectData const* gameObjectData = GetGOData())
-        return gameObjectData->ScriptId;
+        if (uint32 scriptId = gameObjectData->ScriptId)
+            return scriptId;

    return GetGOInfo()->ScriptId;
 }