diff options
| author | Spp <spp@jorge.gr> | 2012-11-27 14:15:12 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-27 14:15:12 +0100 |
| commit | 404129963c8536ced7c1398827e0f7ef9391bcba (patch) | |
| tree | 683d17c7e8b496f737b741fa393e812bf6866c71 /src/server/game/Handlers/ArenaTeamHandler.cpp | |
| parent | 99e050fb271697ded6bf649c3173e7d04a196a74 (diff) | |
| parent | e9544985608e551d3765dea525d63b30d2c03b17 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Groups/Group.cpp
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ArenaTeamHandler.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Spline/MoveSpline.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Movement/Spline/MovementUtil.cpp
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Spells/Auras/SpellAuraDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Commands/cs_disable.cpp
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/ungoro_crater.cpp
src/server/shared/Packets/ByteBuffer.h
src/tools/map_extractor/dbcfile.h
Diffstat (limited to 'src/server/game/Handlers/ArenaTeamHandler.cpp')
| -rw-r--r--[-rwxr-xr-x] | src/server/game/Handlers/ArenaTeamHandler.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index 1116587a63b..daeb037b484 100755..100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -29,7 +29,7 @@ #include "ArenaTeamMgr.h" #include "Opcodes.h" -void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData) +void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_INSPECT_ARENA_TEAMS"); @@ -50,7 +50,7 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData) } } -void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_QUERY"); @@ -64,7 +64,7 @@ void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recvData) } } -void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_ROSTER"); @@ -123,7 +123,7 @@ void WorldSession::HandleArenaTeamCreateOpcode(WorldPacket & recvData) SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, name, "", ERR_ARENA_TEAM_CREATED); } -void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_INVITE"); @@ -248,7 +248,7 @@ void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recvData*/) _player->SetArenaTeamIdInvited(0); } -void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEAVE"); @@ -290,7 +290,7 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData) SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, arenaTeam->GetName(), "", 0); } -void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_DISBAND"); @@ -312,7 +312,7 @@ void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recvData) } } -void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_REMOVE"); @@ -358,7 +358,7 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recvData) arenaTeam->BroadcastEvent(ERR_ARENA_TEAM_REMOVE_SSS, 0, 3, name, arenaTeam->GetName(), _player->GetName()); } -void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEADER"); |