From 5072de83e91d4937070998c206217a087913e20f Mon Sep 17 00:00:00 2001
From: Pedro Cruz <phac@cin.ufpe.br>
Date: Mon, 18 Nov 2024 20:49:34 -0300
Subject: [PATCH] fix: xp rates display (#3123)

This fixes the display xp rates with low level bonus and boost xp.
---
 src/creatures/players/player.cpp             | 8 ++++++++
 src/creatures/players/player.hpp             | 2 ++
 src/server/network/protocol/protocolgame.cpp | 8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
index a2cf64bc809..3ef1d64e982 100644
--- a/src/creatures/players/player.cpp
+++ b/src/creatures/players/player.cpp
@@ -2739,6 +2739,10 @@ uint16_t Player::getGrindingXpBoost() const {
 	return grindingXpBoost;
 }
 
+uint16_t Player::getDisplayGrindingXpBoost() const {
+	return std::clamp<uint16_t>(grindingXpBoost * (baseXpGain / 100), 0, std::numeric_limits<uint16_t>::max());
+}
+
 void Player::setGrindingXpBoost(uint16_t value) {
 	grindingXpBoost = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value);
 }
@@ -2747,6 +2751,10 @@ uint16_t Player::getXpBoostPercent() const {
 	return xpBoostPercent;
 }
 
+uint16_t Player::getDisplayXpBoostPercent() const {
+	return std::clamp<uint16_t>(xpBoostPercent * (baseXpGain / 100), 0, std::numeric_limits<uint16_t>::max());
+}
+
 void Player::setXpBoostPercent(uint16_t percent) {
 	xpBoostPercent = percent;
 }
diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp
index 03f248cfa2f..6ab3be4ca7a 100644
--- a/src/creatures/players/player.hpp
+++ b/src/creatures/players/player.hpp
@@ -972,8 +972,10 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	uint16_t getVoucherXpBoost() const;
 	void setVoucherXpBoost(uint16_t value);
 	uint16_t getGrindingXpBoost() const;
+	uint16_t getDisplayGrindingXpBoost() const;
 	void setGrindingXpBoost(uint16_t value);
 	uint16_t getXpBoostPercent() const;
+	uint16_t getDisplayXpBoostPercent() const;
 	void setXpBoostPercent(uint16_t percent);
 	uint16_t getStaminaXpBoost() const;
 	void setStaminaXpBoost(uint16_t value);
diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
index 727c1cc0097..38f7600310e 100644
--- a/src/server/network/protocol/protocolgame.cpp
+++ b/src/server/network/protocol/protocolgame.cpp
@@ -3480,8 +3480,8 @@ void ProtocolGame::sendCyclopediaCharacterGeneralStats() {
 	msg.add<uint16_t>(player->getLevel());
 	msg.addByte(player->getLevelPercent());
 	msg.add<uint16_t>(player->getBaseXpGain()); // BaseXPGainRate
-	msg.add<uint16_t>(player->getGrindingXpBoost()); // LowLevelBonus
-	msg.add<uint16_t>(player->getXpBoostPercent()); // XPBoost
+	msg.add<uint16_t>(player->getDisplayGrindingXpBoost()); // LowLevelBonus
+	msg.add<uint16_t>(player->getDisplayXpBoostPercent()); // XPBoost
 	msg.add<uint16_t>(player->getStaminaXpBoost()); // StaminaMultiplier(100=x1.0)
 	msg.add<uint16_t>(player->getXpBoostTime()); // xpBoostRemainingTime
 	msg.addByte(player->getXpBoostTime() > 0 ? 0x00 : 0x01); // canBuyXpBoost
@@ -7840,8 +7840,8 @@ void ProtocolGame::AddPlayerStats(NetworkMessage &msg) {
 		msg.add<uint16_t>(player->getVoucherXpBoost()); // xp voucher
 	}
 
-	msg.add<uint16_t>(player->getGrindingXpBoost()); // low level bonus
-	msg.add<uint16_t>(player->getXpBoostPercent()); // xp boost
+	msg.add<uint16_t>(player->getDisplayGrindingXpBoost()); // low level bonus
+	msg.add<uint16_t>(player->getDisplayXpBoostPercent()); // xp boost
 	msg.add<uint16_t>(player->getStaminaXpBoost()); // stamina multiplier (100 = 1.0x)
 
 	if (!oldProtocol) {