From 15fbb6f46fb24fdc6f91786543b32f247e6525fc Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 29 Oct 2014 21:13:21 +0100 Subject: Core/Entites: Updated GUID format --- src/server/game/Chat/Chat.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Chat/Chat.cpp') diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 6c939cd926a..afe55563290 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -950,7 +950,7 @@ GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(ObjectGuid::Lo Player* pl = m_session->GetPlayer(); - GameObject* obj = pl->GetMap()->GetGameObject(ObjectGuid(HighGuid::GameObject, entry, lowguid)); + GameObject* obj = pl->GetMap()->GetGameObject(ObjectGuid::Create(pl->GetMapId(), entry, lowguid)); if (!obj && sObjectMgr->GetGOData(lowguid)) // guid is DB guid of object { @@ -1100,7 +1100,7 @@ ObjectGuid ChatHandler::extractGuidFromLink(char* text) ObjectGuid::LowType lowguid = strtoull(idS, nullptr, 10); if (CreatureData const* data = sObjectMgr->GetCreatureData(lowguid)) - return ObjectGuid(HighGuid::Creature, data->id, lowguid); + return ObjectGuid::Create(data->mapid, data->id, lowguid); else return ObjectGuid::Empty; } @@ -1109,7 +1109,7 @@ ObjectGuid ChatHandler::extractGuidFromLink(char* text) ObjectGuid::LowType lowguid = strtoull(idS, nullptr, 10); if (GameObjectData const* data = sObjectMgr->GetGOData(lowguid)) - return ObjectGuid(HighGuid::GameObject, data->id, lowguid); + return ObjectGuid::Create(data->mapid, data->id, lowguid); else return ObjectGuid::Empty; } -- cgit v1.2.3