Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp

1 files changed, 2 insertions, 14 deletions

diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index bff4087bdd5..db8fd6edae3 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -799,7 +799,7 @@ void WorldSession::HandleRequestRatedBattlefieldInfo(WorldPacket& recvData)
 
     /// @Todo: perfome research in this case
     /// The unk fields are related to arenas
-    WorldPacket data(SMSG_RATED_BG_STATS, 72);
+    WorldPacket data(SMSG_RATED_BATTLEFIELD_INFO, 72);
     data << uint32(0);      // BgWeeklyWins20vs20
     data << uint32(0);      // BgWeeklyPlayed20vs20
     data << uint32(0);      // BgWeeklyPlayed15vs15
@@ -848,17 +848,5 @@ void WorldSession::HandleRequestPvpReward(WorldPacket& /*recvData*/)
 
 void WorldSession::HandleRequestRatedBgStats(WorldPacket& /*recvData*/)
 {
-    TC_LOG_DEBUG("network", "WORLD: CMSG_REQUEST_RATED_BG_STATS");
-
-    WorldPacket data(SMSG_BATTLEFIELD_RATED_INFO, 29);
-    data << uint32(0);  // Reward
-    data << uint8(3);   // unk
-    data << uint32(0);  // unk
-    data << uint32(0);  // unk
-    data << _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, true);
-    data << uint32(0);  // unk
-    data << uint32(0);  // unk
-    data << _player->GetCurrency(CURRENCY_TYPE_CONQUEST_POINTS, true);
-
-    SendPacket(&data);
+    // deleted opcode
 }