sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core): Crashfix. (#12092)

Browse Source
This commit is contained in:
UltraNix
2022-06-18 14:46:33 +02:00
committed by GitHub
parent e162d07aef
commit 9d19aaf6a2
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_gobject.cpp
+14 -7
View File
@@ -496,7 +496,7 @@ public:
} }
//show info of gameobject //show info of gameobject
static bool HandleGameObjectInfoCommand(ChatHandler* handler, Optional<Variant<GameObjectEntry, std::string_view>> objectId) static bool HandleGameObjectInfoCommand(ChatHandler* handler, Optional<EXACT_SEQUENCE("guid")> isGuid, Variant<Hyperlink<gameobject_entry>, Hyperlink<gameobject>, uint32> data)
{ {
uint32 entry = 0; uint32 entry = 0;
uint32 type = 0; uint32 type = 0;
@@ -505,17 +505,24 @@ public:
uint32 lootId = 0; uint32 lootId = 0;
GameObject* gameObject = nullptr; GameObject* gameObject = nullptr;
if (!objectId) ObjectGuid::LowType spawnId = 0;
if (isGuid || data.holds_alternative<Hyperlink<gameobject>>())
{ {
if (WorldObject* object = handler->getSelectedObject()) spawnId = *data;
GameObjectData const* spawnData = sObjectMgr->GetGOData(spawnId);
if (!spawnData)
{ {
entry = object->GetEntry(); handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, spawnId);
if (object->GetTypeId() == TYPEID_GAMEOBJECT) handler->SetSentErrorMessage(true);
gameObject = object->ToGameObject(); return false;
} }
entry = spawnData->id;
gameObject = handler->GetObjectFromPlayerMapByDbGuid(spawnId);
} }
else else
entry = static_cast<uint32>(objectId->get<GameObjectEntry>()); {
entry = *data;
}
GameObjectTemplate const* gameObjectInfo = sObjectMgr->GetGameObjectTemplate(entry); GameObjectTemplate const* gameObjectInfo = sObjectMgr->GetGameObjectTemplate(entry);
if (!gameObjectInfo) if (!gameObjectInfo)