From 77f13636b75f9b25fc1290e297cd002e7df3c89b Mon Sep 17 00:00:00 2001 From: acidmanifesto Date: Tue, 22 Mar 2022 09:49:06 -0400 Subject: [PATCH] fix (core) Script Names not loaded with manual add (#11102) This fixes Script names not being loaded with npcs and gameobjects when manually added with the .npc\gameobject add cmd that would lead the user to restart the server to load up the npc\gameobject with the script that was manually added --- src/server/game/Entities/Creature/Creature.cpp | 3 ++- src/server/game/Entities/GameObject/GameObject.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index b80f32d81..6eaac5e8c 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2837,7 +2837,8 @@ std::string Creature::GetScriptName() const uint32 Creature::GetScriptId() const { if (CreatureData const* creatureData = GetCreatureData()) - return creatureData->ScriptId; + if (uint32 scriptId = creatureData->ScriptId) + return scriptId; return sObjectMgr->GetCreatureTemplate(GetEntry())->ScriptID; } diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index ff5b9a8f5..a4ab35262 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2141,7 +2141,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; }