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
@@ -106,7 +106,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket& recvData)
|
||||
return;
|
||||
}
|
||||
|
||||
Player* player = sObjectAccessor->FindPlayerByName(memberName);
|
||||
Player* player = ObjectAccessor::FindPlayerByName(memberName);
|
||||
|
||||
// no player
|
||||
if (!player)
|
||||
@@ -831,7 +831,7 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData)
|
||||
if (!group->HasFreeSlotSubGroup(groupNr))
|
||||
return;
|
||||
|
||||
Player* movedPlayer = sObjectAccessor->FindConnectedPlayerByName(name);
|
||||
Player* movedPlayer = ObjectAccessor::FindConnectedPlayerByName(name);
|
||||
ObjectGuid guid;
|
||||
|
||||
if (movedPlayer)
|
||||
@@ -1200,7 +1200,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
ObjectGuid Guid;
|
||||
recvData >> Guid;
|
||||
|
||||
Player* player = HashMapHolder<Player>::Find(Guid);
|
||||
Player* player = ObjectAccessor::FindConnectedPlayer(Guid);
|
||||
if (!player)
|
||||
{
|
||||
WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
|
||||
|
||||
Reference in new issue
Block a user