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
@@ -299,7 +299,7 @@ public:
|
||||
if (!*args)
|
||||
return false;
|
||||
|
||||
Player* target = sObjectAccessor->FindPlayerByName(args);
|
||||
Player* target = ObjectAccessor::FindPlayerByName(args);
|
||||
uint32 targetGuid = 0;
|
||||
std::string name(args);
|
||||
|
||||
|
||||
Reference in new issue
Block a user