Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Battlegrounds/ArenaTeamMgr.cpp src/server/game/Handlers/GroupHandler.cpp
This commit is contained in:
commit
c238e8faff
17 files changed
+43
-43
No files matched your search
@@ -427,7 +427,7 @@ public:
|
||||
|
||||
// Detect target's GUID
|
||||
ObjectGuid guid;
|
||||
if (Player* player = sObjectAccessor->FindPlayerByName(name))
|
||||
if (Player* player = ObjectAccessor::FindPlayerByName(name))
|
||||
guid = player->GetGUID();
|
||||
else
|
||||
guid = sObjectMgr->GetPlayerGUIDByName(name);
|
||||
|
||||
Reference in new issue
Block a user