From 43d737d376fcff99027b55646bcdb07b221ed3f3 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:26:18 -0300 Subject: [PATCH] Fix max XP rate calculation for Joyous Journeys event Removes the addition of Joyous Journeys XP rate to the max allowed rate, ensuring the configured maximum is respected. Updates the player login message to clarify that experience gains are increased during the event without referencing a specific rate. --- src/mod-double-xp-weekend.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod-double-xp-weekend.cpp b/src/mod-double-xp-weekend.cpp index 9eae51d..d06c0e4 100644 --- a/src/mod-double-xp-weekend.cpp +++ b/src/mod-double-xp-weekend.cpp @@ -145,7 +145,7 @@ class DoubleXpWeekend float ConfigJoyousJourneysXPRate() const { return sConfigMgr->GetOption("XPWeekend.JoyousJourneysXPRate", 1.0f); } float ConfigJoyousJourneysRepRate() const { return sConfigMgr->GetOption("XPWeekend.JoyousJourneysRepRate", 1.10f); } bool ExcludeInsaneReps() const { return sConfigMgr->GetOption("XPWeekend.ExcludeInsaneReps", true); } - float ConfigMaxAllowedRate() const { return sConfigMgr->GetOption("XPWeekend.MaxAllowedRate", 2.0f) + (IsJoyousJourneysActive() ? ConfigJoyousJourneysXPRate() : 0.0f); } + float ConfigMaxAllowedRate() const { return sConfigMgr->GetOption("XPWeekend.MaxAllowedRate", 2.0f); } private: @@ -314,7 +314,7 @@ class DoubleXpWeekendPlayerScript : public PlayerScript mod->OnPlayerLogin(player, &handler); if (mod->IsJoyousJourneysActive() && mod->ConfigJoyousJourneysXPRate()) - handler.PSendSysMessage("|cff00ccffThe Joyous Journeys event is active! You may set your rates up to {} while it is active!|r", mod->ConfigMaxAllowedRate()); + handler.PSendSysMessage("|cff00ccffThe Joyous Journeys event is active! Experience gains have been increased.|r"); } void OnPlayerGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 xpSource) override