From 031363620dafae0939f2ac2e89eb7d36ba67ca81 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 2 Nov 2020 22:17:30 +0100 Subject: [PATCH] Core/Packets: named and handled yet another fields in SMSG_BATTLEFIELD_RATED_INFO packet. This fixes random battleground conquest rewards being displayed corrected when getting closer to the weekly cap --- src/server/game/Handlers/BattleGroundHandler.cpp | 1 + src/server/game/Server/Packets/BattlegroundPackets.cpp | 2 +- src/server/game/Server/Packets/BattlegroundPackets.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index a71087b8005..03e4862fa55 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -819,6 +819,7 @@ void WorldSession::HandleRequestRatedBgInfo(WorldPacket & recvData) packet.Reward = ratedBattlegroundReward; packet.RatedMaxRewardPointsThisWeek = _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, true); packet.MaxRewardPointsThisWeek = _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_POINTS, true); + packet.RewardPointsThisWeek = _player->GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_POINTS, true); SendPacket(packet.Write()); diff --git a/src/server/game/Server/Packets/BattlegroundPackets.cpp b/src/server/game/Server/Packets/BattlegroundPackets.cpp index f3e7cd07f4c..b196c842cc1 100644 --- a/src/server/game/Server/Packets/BattlegroundPackets.cpp +++ b/src/server/game/Server/Packets/BattlegroundPackets.cpp @@ -56,7 +56,7 @@ WorldPacket const* WorldPackets::Battleground::BattlefieldRatedInfo::Write() _worldPacket << int32(Reward); _worldPacket << int8(Unk); _worldPacket << int32(PersonalRating); - _worldPacket << int32(0); + _worldPacket << int32(RewardPointsThisWeek); _worldPacket << int32(RatedMaxRewardPointsThisWeek); // this and MaxRewardPointsThisWeek are weekly conquest limits but not sure which one is for rated BGs _worldPacket << int32(0); _worldPacket << int32(0); diff --git a/src/server/game/Server/Packets/BattlegroundPackets.h b/src/server/game/Server/Packets/BattlegroundPackets.h index c6dcb2ad22f..ea94e41c062 100644 --- a/src/server/game/Server/Packets/BattlegroundPackets.h +++ b/src/server/game/Server/Packets/BattlegroundPackets.h @@ -64,6 +64,7 @@ namespace WorldPackets int32 PersonalRating = 0; int32 RatedMaxRewardPointsThisWeek = 0; int32 MaxRewardPointsThisWeek = 0; + int32 RewardPointsThisWeek = 0; int8 Unk = 0; // Same value as in cmsg };