diff options
Diffstat (limited to 'src/game/ArenaTeamHandler.cpp')
| -rw-r--r-- | src/game/ArenaTeamHandler.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp index a3de4097a8f..3e25cf07985 100644 --- a/src/game/ArenaTeamHandler.cpp +++ b/src/game/ArenaTeamHandler.cpp @@ -37,13 +37,13 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data) recv_data >> guid; sLog.outDebug("Inspect Arena stats (GUID: %u TypeId: %u)", GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid))); - if(Player *plr = objmgr.GetPlayer(guid)) + if (Player *plr = objmgr.GetPlayer(guid)) { for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i) { - if(uint32 a_id = plr->GetArenaTeamId(i)) + if (uint32 a_id = plr->GetArenaTeamId(i)) { - if(ArenaTeam *at = objmgr.GetArenaTeamById(a_id)) + if (ArenaTeam *at = objmgr.GetArenaTeamById(a_id)) at->InspectStats(this, plr->GetGUID()); } } @@ -57,7 +57,7 @@ void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recv_data) uint32 ArenaTeamId; recv_data >> ArenaTeamId; - if(ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId)) + if (ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId)) { arenateam->Query(this); arenateam->Stats(this); @@ -71,7 +71,7 @@ void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recv_data) uint32 ArenaTeamId; // arena team id recv_data >> ArenaTeamId; - if(ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId)) + if (ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId)) arenateam->Roster(this); } @@ -86,35 +86,35 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data) recv_data >> ArenaTeamId >> Invitedname; - if(!Invitedname.empty()) + if (!Invitedname.empty()) { - if(!normalizePlayerName(Invitedname)) + if (!normalizePlayerName(Invitedname)) return; player = ObjectAccessor::Instance().FindPlayerByName(Invitedname.c_str()); } - if(!player) + if (!player) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", Invitedname, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S); return; } - if(player->getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)) + if (player->getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", player->GetName(), ERR_ARENA_TEAM_PLAYER_TO_LOW); return; } ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId); - if(!arenateam) + if (!arenateam) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PLAYER_NOT_IN_TEAM); return; } // OK result but not send invite - if(player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow())) + if (player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow())) return; if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != GetPlayer()->GetTeam()) @@ -123,19 +123,19 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data) return; } - if(player->GetArenaTeamId(arenateam->GetSlot())) + if (player->GetArenaTeamId(arenateam->GetSlot())) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", player->GetName(), ERR_ALREADY_IN_ARENA_TEAM_S); return; } - if(player->GetArenaTeamIdInvited()) + if (player->GetArenaTeamIdInvited()) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", player->GetName(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S); return; } - if(arenateam->GetMembersSize() >= arenateam->GetType() * 2) + if (arenateam->GetMembersSize() >= arenateam->GetType() * 2) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,arenateam->GetName(),"",ERR_ARENA_TEAM_FULL); return; @@ -158,10 +158,10 @@ void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/) sLog.outDebug("CMSG_ARENA_TEAM_ACCEPT"); // empty opcode ArenaTeam *at = objmgr.GetArenaTeamById(_player->GetArenaTeamIdInvited()); - if(!at) + if (!at) return; - if(_player->GetArenaTeamId(at->GetSlot())) + if (_player->GetArenaTeamId(at->GetSlot())) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ALREADY_IN_ARENA_TEAM); // already in arena team that size return; @@ -173,7 +173,7 @@ void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/) return; } - if(!at->AddMember(_player->GetGUID())) + if (!at->AddMember(_player->GetGUID())) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ARENA_TEAM_INTERNAL);// arena team not found return; @@ -200,10 +200,10 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recv_data) recv_data >> ArenaTeamId; ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId); - if(!at) + if (!at) return; - if(_player->GetGUID() == at->GetCaptain() && at->GetMembersSize() > 1) + if (_player->GetGUID() == at->GetCaptain() && at->GetMembersSize() > 1) { // check for correctness SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_LEADER_LEAVE_S); @@ -211,7 +211,7 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recv_data) } // arena team has only one member (=captain) - if(_player->GetGUID() == at->GetCaptain()) + if (_player->GetGUID() == at->GetCaptain()) { at->Disband(this); delete at; @@ -236,12 +236,12 @@ void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recv_data) uint32 ArenaTeamId; // arena team id recv_data >> ArenaTeamId; - if(ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId)) + if (ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId)) { - if(at->GetCaptain() != _player->GetGUID()) + if (at->GetCaptain() != _player->GetGUID()) return; - if(at->IsFighting()) + if (at->IsFighting()) return; at->Disband(this); @@ -260,26 +260,26 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recv_data) recv_data >> name; ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId); - if(!at) // arena team not found + if (!at) // arena team not found return; - if(at->GetCaptain() != _player->GetGUID()) + if (at->GetCaptain() != _player->GetGUID()) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS); return; } - if(!normalizePlayerName(name)) + if (!normalizePlayerName(name)) return; ArenaTeamMember* member = at->GetMember(name); - if(!member) // member not found + if (!member) // member not found { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", name, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S); return; } - if(at->GetCaptain() == member->guid) + if (at->GetCaptain() == member->guid) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_LEADER_LEAVE_S); return; @@ -304,26 +304,26 @@ void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recv_data) recv_data >> name; ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId); - if(!at) // arena team not found + if (!at) // arena team not found return; - if(at->GetCaptain() != _player->GetGUID()) + if (at->GetCaptain() != _player->GetGUID()) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS); return; } - if(!normalizePlayerName(name)) + if (!normalizePlayerName(name)) return; ArenaTeamMember* member = at->GetMember(name); - if(!member) // member not found + if (!member) // member not found { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", name, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S); return; } - if(at->GetCaptain() == member->guid) // target player already captain + if (at->GetCaptain() == member->guid) // target player already captain return; at->SetCaptain(member->guid); @@ -374,7 +374,7 @@ void WorldSession::SendNotInArenaTeamPacket(uint8 type) WorldPacket data(SMSG_ARENA_ERROR, 4+1); // 886 - You are not in a %uv%u arena team uint32 unk = 0; data << uint32(unk); // unk(0) - if(!unk) + if (!unk) data << uint8(type); // team type (2=2v2,3=3v3,5=5v5), can be used for custom types... SendPacket(&data); } |