Refactor Joyous Journeys XP rate calculation

Author: Nyeriah

src/mod-double-xp-weekend.cpp

@@ -235,17 +235,17 @@ class DoubleXpWeekend
             return 1.0f;
         }
 
-        if (IsJoyousJourneysActive())
-        {
-            rate += ConfigJoyousJourneysXPRate();
-        }
-
         // If individualxp setting is enabled... and a rate was set, overwrite it.
         if (ConfigIndividualXPEnabled())
         {
             rate = PlayerSettingGetRate(player);
         }
 
+        if (IsJoyousJourneysActive())
+        {
+            rate += ConfigJoyousJourneysXPRate();
+        }
+
         // Prevent returning 0% rate.
         return rate > 0.0f ? rate : 1.0f;
     }