diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 20:27:00 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 20:27:00 +0200 |
| commit | 034561792ca9a07d719961ea842af2118428816f (patch) | |
| tree | a3e360f5fd1d439508dd29ee22a5983a828f8306 /src/server/game/Chat/Chat.cpp | |
| parent | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (diff) | |
Core/Entities: Second batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index ac3f9350412..5d895d718ba 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -132,7 +132,7 @@ bool ChatHandler::HasLowerSecurity(Player* target, ObjectGuid guid, bool strong) if (target) target_session = target->GetSession(); - else if (guid) + else if (!guid.IsEmpty()) target_account = sObjectMgr->GetPlayerAccountIdByGUID(guid); if (!target_session && !target_account) @@ -1093,10 +1093,7 @@ ObjectGuid ChatHandler::extractGuidFromLink(char* text) if (Player* player = ObjectAccessor::FindPlayerByName(name)) return player->GetGUID(); - if (ObjectGuid guid = sObjectMgr->GetPlayerGUIDByName(name)) - return guid; - - return ObjectGuid::Empty; + return sObjectMgr->GetPlayerGUIDByName(name); } case SPELL_LINK_CREATURE: { |