Many, many cmangos Cata commits applied

The following commits were either applied or found not to be applicable:
This commit is contained in:
Charles A Edwards 2016-08-27 18:42:03 +01:00 committed by Antz
parent 32a26f44c7
commit a800f3b1ad
100 changed files with 2385 additions and 1305 deletions

View file

@ -40,15 +40,22 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket& recv_data)
recv_data >> guid;
DEBUG_LOG("Inspect Arena stats %s", guid.GetString().c_str());
if (Player* plr = sObjectMgr.GetPlayer(guid))
Player* player = sObjectMgr.GetPlayer(guid);
if (!player)
return;
if (!_player->IsWithinDistInMap(player, INSPECT_DISTANCE, false))
return;
if (_player->IsHostileTo(player))
return;
for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i)
{
for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i)
if (uint32 a_id = player->GetArenaTeamId(i))
{
if (uint32 a_id = plr->GetArenaTeamId(i))
{
if (ArenaTeam* at = sObjectMgr.GetArenaTeamById(a_id))
at->InspectStats(this, plr->GetObjectGuid());
}
if (ArenaTeam* arenaTeam = sObjectMgr.GetArenaTeamById(a_id))
arenaTeam->InspectStats(this, player->GetObjectGuid());
}
}
}