diff options
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 34 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeam.cpp | 101 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeam.h | 5 | ||||
| -rw-r--r-- | src/server/game/Handlers/ArenaTeamHandler.cpp | 405 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.h | 6 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 14 |
7 files changed, 6 insertions, 565 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 40401b2ba31..02e0b1a17a2 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -1215,36 +1215,6 @@ void AchievementMgr<T>::UpdateAchievementCriteria(AchievementCriteriaTypes type, else SetCriteriaProgress(achievementCriteria, miscValue1, referencePlayer, PROGRESS_ACCUMULATE); break; - case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING: - { - uint32 reqTeamType = achievementCriteria->Entry->Asset.TeamType; - - if (miscValue1) - { - if (miscValue2 != reqTeamType) - continue; - - SetCriteriaProgress(achievementCriteria, miscValue1, referencePlayer, PROGRESS_HIGHEST); - } - else // login case - { - for (uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot) - { - uint32 teamId = referencePlayer->GetArenaTeamId(arena_slot); - if (!teamId) - continue; - - ArenaTeam* team = sArenaTeamMgr->GetArenaTeamById(teamId); - if (!team || team->GetType() != reqTeamType) - continue; - - SetCriteriaProgress(achievementCriteria, team->GetStats().Rating, referencePlayer, PROGRESS_HIGHEST); - break; - } - } - - break; - } case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING: { uint32 reqTeamType = achievementCriteria->Entry->Asset.TeamType; @@ -1283,6 +1253,7 @@ void AchievementMgr<T>::UpdateAchievementCriteria(AchievementCriteriaTypes type, // FIXME: not triggered in code as result, need to implement case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_RAID: case ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA: + case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING: case ACHIEVEMENT_CRITERIA_TYPE_OWN_RANK: case ACHIEVEMENT_CRITERIA_TYPE_SPENT_GOLD_GUILD_REPAIRS: case ACHIEVEMENT_CRITERIA_TYPE_CRAFT_ITEMS_GUILD: @@ -2143,7 +2114,6 @@ bool AchievementMgr<T>::RequirementsSatisfied(AchievementCriteria const* achieve case ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION: case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_GOLD_VALUE_OWNED: case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING: - case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING: case ACHIEVEMENT_CRITERIA_TYPE_KNOWN_FACTIONS: case ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL: case ACHIEVEMENT_CRITERIA_TYPE_ON_LOGIN: @@ -2373,6 +2343,8 @@ bool AchievementMgr<T>::RequirementsSatisfied(AchievementCriteria const* achieve if (miscValue1 != achievementCriteria->Entry->Asset.MapID) return false; break; + case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING: + return false default: break; } diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index dc3b5dd81ee..9b71bd8a1a4 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -387,59 +387,6 @@ void ArenaTeam::Disband() sArenaTeamMgr->RemoveArenaTeam(TeamId); } -void ArenaTeam::Roster(WorldSession* session) -{ - Player* player = NULL; - - uint8 unk308 = 0; - - WorldPacket data(SMSG_ARENA_TEAM_ROSTER, 100); - data << uint32(GetId()); // team id - data << uint8(unk308); // 3.0.8 unknown value but affect packet structure - data << uint32(GetMembersSize()); // members count - data << uint32(GetType()); // arena team type? - - for (MemberList::const_iterator itr = Members.begin(); itr != Members.end(); ++itr) - { - player = ObjectAccessor::FindConnectedPlayer(itr->Guid); - - data << itr->Guid; // guid - data << uint8((player ? 1 : 0)); // online flag - data << itr->Name; // member name - data << uint32((itr->Guid == GetCaptain() ? 0 : 1)); // captain flag 0 captain 1 member - data << uint8((player ? player->getLevel() : 0)); // unknown, level? - data << uint8(itr->Class); // class - data << uint32(itr->WeekGames); // played this week - data << uint32(itr->WeekWins); // wins this week - data << uint32(itr->SeasonGames); // played this season - data << uint32(itr->SeasonWins); // wins this season - data << uint32(itr->PersonalRating); // personal rating - //if (unk308) - //{ - // data << float(0.0f); // 308 unk - // data << float(0.0f); // 308 unk - //} - } - - session->SendPacket(&data); - TC_LOG_DEBUG("network", "WORLD: Sent SMSG_ARENA_TEAM_ROSTER"); -} - -void ArenaTeam::Query(WorldSession* session) -{ - WorldPacket data(SMSG_ARENA_TEAM_QUERY_RESPONSE, 4*7+GetName().size()+1); - data << uint32(GetId()); // team id - data << GetName(); // team name - data << uint32(GetType()); // arena team type (2=2x2, 3=3x3 or 5=5x5) - data << uint32(BackgroundColor); // background color - data << uint32(EmblemStyle); // emblem style - data << uint32(EmblemColor); // emblem color - data << uint32(BorderStyle); // border style - data << uint32(BorderColor); // border color - session->SendPacket(&data); - TC_LOG_DEBUG("network", "WORLD: Sent SMSG_ARENA_TEAM_QUERY_RESPONSE"); -} - void ArenaTeam::SendStats(WorldSession* session) { WorldPacket data(SMSG_ARENA_TEAM_STATS, 4*7); @@ -509,54 +456,6 @@ void ArenaTeam::BroadcastPacket(WorldPacket* packet) player->GetSession()->SendPacket(packet); } -void ArenaTeam::BroadcastEvent(ArenaTeamEvents event, ObjectGuid guid, uint8 strCount, std::string const& str1, std::string const& str2, std::string const& str3) -{ - WorldPacket data(SMSG_ARENA_TEAM_EVENT, 1+1+1); - data << uint8(event); - data << uint8(strCount); - switch (strCount) - { - case 0: - break; - case 1: - data << str1; - break; - case 2: - data << str1 << str2; - break; - case 3: - data << str1 << str2 << str3; - break; - default: - TC_LOG_ERROR("bg.arena", "Unhandled strCount %u in ArenaTeam::BroadcastEvent", strCount); - return; - } - - if (!guid.IsEmpty()) - data << guid; - - BroadcastPacket(&data); - - TC_LOG_DEBUG("network", "WORLD: Sent SMSG_ARENA_TEAM_EVENT"); -} - -void ArenaTeam::MassInviteToEvent(WorldSession* session) -{ - WorldPacket data(SMSG_CALENDAR_ARENA_TEAM, (Members.size() - 1) * (4 + 8 + 1)); - data << uint32(Members.size() - 1); - - for (MemberList::const_iterator itr = Members.begin(); itr != Members.end(); ++itr) - { - if (itr->Guid != session->GetPlayer()->GetGUID()) - { - data << itr->Guid.WriteAsPacked(); - data << uint8(0); // unk - } - } - - session->SendPacket(&data); -} - uint8 ArenaTeam::GetSlotByType(uint32 type) { switch (type) diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 65a6b38088d..4a8231f2a3f 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -155,13 +155,8 @@ class ArenaTeam void SaveToDB(); void BroadcastPacket(WorldPacket* packet); - void BroadcastEvent(ArenaTeamEvents event, ObjectGuid guid, uint8 strCount, std::string const& str1, std::string const& str2, std::string const& str3); void NotifyStatsChanged(); - void MassInviteToEvent(WorldSession* session); - - void Roster(WorldSession* session); - void Query(WorldSession* session); void SendStats(WorldSession* session); void Inspect(WorldSession* session, ObjectGuid guid); diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index f5546c28a2b..f4fb9dcd1b2 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -29,411 +29,6 @@ #include "ArenaTeamMgr.h" #include "Opcodes.h" -void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "MSG_INSPECT_ARENA_TEAMS"); - - ObjectGuid guid; - recvData >> guid; - TC_LOG_DEBUG("network", "Inspect Arena stats %s", guid.ToString().c_str()); - - Player* player = ObjectAccessor::FindPlayer(guid); - - if (!player) - return; - - if (!GetPlayer()->IsWithinDistInMap(player, INSPECT_DISTANCE, false)) - return; - - if (GetPlayer()->IsValidAttackTarget(player)) - return; - - for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i) - { - if (uint32 a_id = player->GetArenaTeamId(i)) - { - if (ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(a_id)) - arenaTeam->Inspect(this, player->GetGUID()); - } - } -} - -void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "WORLD: Received CMSG_ARENA_TEAM_QUERY"); - - uint32 arenaTeamId; - recvData >> arenaTeamId; - - if (ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(arenaTeamId)) - { - arenaTeam->Query(this); - arenaTeam->SendStats(this); - } -} - -void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "WORLD: Received CMSG_ARENA_TEAM_ROSTER"); - - uint32 arenaTeamId; // arena team id - recvData >> arenaTeamId; - - if (ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(arenaTeamId)) - arenaTeam->Roster(this); -} - -void WorldSession::HandleArenaTeamCreateOpcode(WorldPacket & recvData) -{ - TC_LOG_DEBUG("network", "WORLD: Received CMSG_ARENA_TEAM_CREATE"); - - uint32 slot, icon, iconcolor, border, bordercolor, background; - std::string name; - - recvData >> slot; - recvData >> iconcolor; - recvData >> bordercolor; - recvData >> border; - recvData >> background; - recvData >> icon; - name = recvData.ReadString(recvData.ReadBits(8)); - - uint8 type = ArenaTeam::GetTypeBySlot(slot); - - if (_player->GetArenaTeamId(slot)) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName(), ERR_ALREADY_IN_ARENA_TEAM_S); - return; - } - - if (sObjectMgr->IsReservedName(name) || !ObjectMgr::IsValidCharterName(name)) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, name, "", ERR_ARENA_TEAM_NAME_INVALID); - return; - } - - if (sArenaTeamMgr->GetArenaTeamByName(name)) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, name, "", ERR_ARENA_TEAM_NAME_EXISTS_S); - return; - } - - ArenaTeam* arenaTeam = new ArenaTeam; - if (!arenaTeam->Create(_player->GetGUID(), type, name, background, icon, iconcolor, border, bordercolor)) - { - TC_LOG_ERROR("bg.arena", "Arena team create failed."); - delete arenaTeam; - return; - } - - sArenaTeamMgr->AddArenaTeam(arenaTeam); - - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, name, "", ERR_ARENA_TEAM_CREATED); -} - -void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "CMSG_ARENA_TEAM_INVITE"); - - uint32 arenaTeamId; // arena team id - std::string invitedName; - - Player* player = NULL; - - recvData >> arenaTeamId >> invitedName; - - if (!invitedName.empty()) - { - if (!normalizePlayerName(invitedName)) - return; - - player = ObjectAccessor::FindPlayerByName(invitedName); - } - - if (!player) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", invitedName, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S); - return; - } - - if (player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", player->GetName(), ERR_ARENA_TEAM_TARGET_TOO_LOW_S); - return; - } - - ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(arenaTeamId); - if (!arenaTeam) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PLAYER_NOT_IN_TEAM); - return; - } - - if (arenaTeam->GetCaptain() != _player->GetGUID()) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS); - return; - } - - if (GetPlayer()->GetArenaTeamId(arenaTeam->GetSlot()) != arenaTeamId) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS); - return; - } - - // OK result but don't send invite - if (player->GetSocial()->HasIgnore(GetPlayer()->GetGUID())) - return; - - if (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != GetPlayer()->GetTeam()) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED); - return; - } - - if (player->GetArenaTeamId(arenaTeam->GetSlot())) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", player->GetName(), ERR_ALREADY_IN_ARENA_TEAM_S); - return; - } - - 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) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, arenaTeam->GetName(), "", ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S); - return; - } - - TC_LOG_DEBUG("bg.battleground", "Player %s Invited %s to Join his ArenaTeam", GetPlayer()->GetName().c_str(), invitedName.c_str()); - - player->SetArenaTeamIdInvited(arenaTeam->GetId()); - - WorldPacket data(SMSG_ARENA_TEAM_INVITE, (8+10)); - data << GetPlayer()->GetName(); - data << arenaTeam->GetName(); - player->GetSession()->SendPacket(&data); - - TC_LOG_DEBUG("network", "WORLD: Sent SMSG_ARENA_TEAM_INVITE"); -} - -void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recvData*/) -{ - TC_LOG_DEBUG("network", "CMSG_ARENA_TEAM_ACCEPT"); // empty opcode - - ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(_player->GetArenaTeamIdInvited()); - if (!arenaTeam) - return; - - // Check if player is already in another team of the same size - if (_player->GetArenaTeamId(arenaTeam->GetSlot())) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ALREADY_IN_ARENA_TEAM); - return; - } - - // Only allow members of the other faction to join the team if cross faction interaction is enabled - if (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && _player->GetTeam() != ObjectMgr::GetPlayerTeamByGUID(arenaTeam->GetCaptain())) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_NOT_ALLIED); - return; - } - - // Add player to team - if (!arenaTeam->AddMember(_player->GetGUID())) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_INTERNAL); - return; - } - - // Broadcast event - arenaTeam->BroadcastEvent(ERR_ARENA_TEAM_JOIN_SS, _player->GetGUID(), 2, _player->GetName(), arenaTeam->GetName(), ""); -} - -void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recvData*/) -{ - TC_LOG_DEBUG("network", "CMSG_ARENA_TEAM_DECLINE"); // empty opcode - - // Remove invite from player - _player->SetArenaTeamIdInvited(0); -} - -void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "CMSG_ARENA_TEAM_LEAVE"); - - uint32 arenaTeamId; - recvData >> arenaTeamId; - - ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(arenaTeamId); - if (!arenaTeam) - return; - - // Disallow leave team while in arena - if (_player->InArena()) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_INTERNAL); - return; - } - - // Team captain can't leave the team if other members are still present - if (_player->GetGUID() == arenaTeam->GetCaptain() && arenaTeam->GetMembersSize() > 1) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_LEADER_LEAVE_S); - return; - } - - // If team consists only of the captain, disband the team - if (_player->GetGUID() == arenaTeam->GetCaptain()) - { - arenaTeam->Disband(this); - delete arenaTeam; - return; - } - else - arenaTeam->DelMember(_player->GetGUID(), true); - - // Broadcast event - arenaTeam->BroadcastEvent(ERR_ARENA_TEAM_LEAVE_SS, _player->GetGUID(), 2, _player->GetName(), arenaTeam->GetName(), ""); - - // Inform player who left - SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, arenaTeam->GetName(), "", 0); -} - -void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "CMSG_ARENA_TEAM_DISBAND"); - - uint32 arenaTeamId; - recvData >> arenaTeamId; - - if (ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(arenaTeamId)) - { - // Only captain can disband the team - if (arenaTeam->GetCaptain() != _player->GetGUID()) - return; - - // Teams cannot be disbanded during fights - if (arenaTeam->IsFighting()) - return; - - arenaTeam->Disband(this); - delete arenaTeam; - } -} - -void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "CMSG_ARENA_TEAM_REMOVE"); - - uint32 arenaTeamId; - std::string name; - - recvData >> arenaTeamId; - recvData >> name; - - // Check for valid arena team - ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(arenaTeamId); - if (!arenaTeam) - return; - - // Only captain can remove members - if (arenaTeam->GetCaptain() != _player->GetGUID()) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS); - return; - } - - if (!normalizePlayerName(name)) - return; - - // Check if team member exists - ArenaTeamMember* member = arenaTeam->GetMember(name); - if (!member) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", name, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S); - return; - } - - // Captain cannot be removed - if (arenaTeam->GetCaptain() == member->Guid) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_LEADER_LEAVE_S); - return; - } - - // Player cannot be removed during fights - if (arenaTeam->IsFighting()) - return; - - arenaTeam->DelMember(member->Guid, true); - - // Broadcast event - arenaTeam->BroadcastEvent(ERR_ARENA_TEAM_REMOVE_SSS, ObjectGuid::Empty, 3, name, arenaTeam->GetName(), _player->GetName()); -} - -void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "CMSG_ARENA_TEAM_LEADER"); - - uint32 arenaTeamId; - std::string name; - - recvData >> arenaTeamId; - recvData >> name; - - // Check for valid arena team - ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(arenaTeamId); - if (!arenaTeam) - return; - - // Only captain can pass leadership - if (arenaTeam->GetCaptain() != _player->GetGUID()) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS); - return; - } - - if (!normalizePlayerName(name)) - return; - - // Check if team member exists - ArenaTeamMember* member = arenaTeam->GetMember(name); - if (!member) - { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", name, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S); - return; - } - - // Check if the target is already team captain - if (arenaTeam->GetCaptain() == member->Guid) - return; - - arenaTeam->SetCaptain(member->Guid); - - // Broadcast event - arenaTeam->BroadcastEvent(ERR_ARENA_TEAM_LEADER_CHANGED_SSS, ObjectGuid::Empty, 3, _player->GetName(), name, arenaTeam->GetName()); -} - -void WorldSession::SendArenaTeamCommandResult(uint32 teamAction, const std::string& team, const std::string& player, uint32 errorId) -{ - WorldPacket data(SMSG_ARENA_TEAM_COMMAND_RESULT, 2 + team.length() + player.length() + 4 + 4); - - data.WriteBits(player.length(), 7); - data.WriteBits(team.length(), 8); - data.FlushBits(); - - data.WriteString(player); - data << uint32(teamAction); - data << uint32(errorId); - data.WriteString(team); - SendPacket(&data); -} - void WorldSession::SendNotInArenaTeamPacket(uint8 type) { WorldPacket data(SMSG_ARENA_ERROR, 4+1); diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 8a14ea695d4..81ea2830a64 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -137,12 +137,12 @@ void OpcodeTable::ValidateAndSetServerOpcode(OpcodeServer opcode, char const* na /// Correspondence between opcodes and their names void OpcodeTable::Initialize() { -#define DEFINE_OPCODE_HANDLER_OLD(opcode, status, processing, handler) \ - ValidateAndSetClientOpcode<WorldPacket, handler>(opcode, #opcode, status, processing); - #define DEFINE_HANDLER(opcode, status, processing, packetclass, handler) \ ValidateAndSetClientOpcode<packetclass, handler>(opcode, #opcode, status, processing); +#define DEFINE_OPCODE_HANDLER_OLD(opcode, status, processing, handler) \ + DEFINE_HANDLER(opcode, status, processing, WorldPacket, handler); + DEFINE_HANDLER(CMSG_ACCEPT_GUILD_INVITE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Guild::AcceptGuildInvite, &WorldSession::HandleGuildAcceptInvite); DEFINE_OPCODE_HANDLER_OLD(CMSG_ACCEPT_LEVEL_GRANT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAcceptGrantLevel ); DEFINE_OPCODE_HANDLER_OLD(CMSG_ACCEPT_TRADE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAcceptTradeOpcode ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index ccf995cf642..ec9a9264757 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1635,14 +1635,8 @@ enum OpcodeServer : uint32 SMSG_ZONE_UNDER_ATTACK = 0x14CF, // Deleted opcodes, here only to allow compile - SMSG_ARENA_TEAM_COMMAND_RESULT = 0xBADD, - SMSG_ARENA_TEAM_EVENT = 0xBADD, - SMSG_ARENA_TEAM_INVITE = 0xBADD, - SMSG_ARENA_TEAM_QUERY_RESPONSE = 0xBADD, - SMSG_ARENA_TEAM_ROSTER = 0xBADD, SMSG_ARENA_TEAM_STATS = 0xBADD, SMSG_BUY_BANK_SLOT_RESULT = 0xBADD, - SMSG_CALENDAR_ARENA_TEAM = 0xBADD, }; inline bool IsInstanceOnlyOpcode(uint32 opcode) diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index a843c672c84..f3fc21af19f 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -726,7 +726,6 @@ class WorldSession void SendDiscoverNewTaxiNode(uint32 nodeid); // Guild/Arena Team - void SendArenaTeamCommandResult(uint32 team_action, std::string const& team, std::string const& player, uint32 error_id = 0); void SendNotInArenaTeamPacket(uint8 type); void SendPetitionShowList(ObjectGuid guid); @@ -1250,19 +1249,6 @@ class WorldSession void SendLfgOfferContinue(uint32 dungeonEntry); void SendLfgTeleportError(uint8 err); - // Arena Team - void HandleInspectArenaTeamsOpcode(WorldPacket& recvData); - void HandleArenaTeamQueryOpcode(WorldPacket& recvData); - void HandleArenaTeamRosterOpcode(WorldPacket& recvData); - void HandleArenaTeamCreateOpcode(WorldPacket& recvData); - void HandleArenaTeamInviteOpcode(WorldPacket& recvData); - void HandleArenaTeamAcceptOpcode(WorldPacket& recvData); - void HandleArenaTeamDeclineOpcode(WorldPacket& recvData); - void HandleArenaTeamLeaveOpcode(WorldPacket& recvData); - void HandleArenaTeamRemoveOpcode(WorldPacket& recvData); - void HandleArenaTeamDisbandOpcode(WorldPacket& recvData); - void HandleArenaTeamLeaderOpcode(WorldPacket& recvData); - void HandleAreaSpiritHealerQueryOpcode(WorldPacket& recvData); void HandleAreaSpiritHealerQueueOpcode(WorldPacket& recvData); void HandleCancelMountAuraOpcode(WorldPacket& recvData); |