diff options
author | Shauren <shauren.trinity@gmail.com> | 2014-10-29 21:13:21 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2014-10-29 21:13:21 +0100 |
commit | 15fbb6f46fb24fdc6f91786543b32f247e6525fc (patch) | |
tree | 3d07a448e71dae1d948aa5a49b4ea818b2e9a986 /src/server/game/Chat/Chat.cpp | |
parent | 13281fef3c85688df18b5ea7cfab74411c6529f7 (diff) |
Core/Entites: Updated GUID format
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
-rw-r--r-- | src/server/game/Chat/Chat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<HighGuid::GameObject>(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<HighGuid::Creature>(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<HighGuid::GameObject>(data->mapid, data->id, lowguid); else return ObjectGuid::Empty; } |