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
@@ -1090,7 +1090,7 @@ ObjectGuid ChatHandler::extractGuidFromLink(char* text)
|
||||
if (!normalizePlayerName(name))
|
||||
return ObjectGuid::Empty;
|
||||
|
||||
if (Player* player = sObjectAccessor->FindPlayerByName(name))
|
||||
if (Player* player = ObjectAccessor::FindPlayerByName(name))
|
||||
return player->GetGUID();
|
||||
|
||||
if (ObjectGuid guid = sObjectMgr->GetPlayerGUIDByName(name))
|
||||
@@ -1148,7 +1148,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, ObjectGuid* p
|
||||
return false;
|
||||
}
|
||||
|
||||
Player* pl = sObjectAccessor->FindPlayerByName(name);
|
||||
Player* pl = ObjectAccessor::FindPlayerByName(name);
|
||||
|
||||
// if allowed player pointer
|
||||
if (player)
|
||||
@@ -1312,7 +1312,7 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player*& player
|
||||
return false;
|
||||
}
|
||||
|
||||
player = sObjectAccessor->FindPlayerByName(name);
|
||||
player = ObjectAccessor::FindPlayerByName(name);
|
||||
if (offline)
|
||||
guid = sObjectMgr->GetPlayerGUIDByName(name.c_str());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user