Fix DR cache wiring for loaded profiles

Author: nossr50

Changelog.txt

@@ -1,5 +1,6 @@
 Version 2.2.054
     Fixed party/admin chat allowing player color code tokens without the 'mcmmo.chat.colors' permission
+    Fixed diminished returns resetting in certain situations when players reconnected
 
 Version 2.2.053
     !! -- This build has important fixes for anyone using Paper (or forks of Paper), please read the notes carefully.
@@ -14,7 +15,6 @@ Version 2.2.053
     Fixed KnockOnWood XP orbs never spawning on nether/warped tree cap blocks during Tree Feller
     Fixed Impale (Tridents) damage bonus formula applying one fewer rank of the multiplier than intended
     Fixed melee attack strength scale resolving to near-zero after Paper fixed a vanilla attack cooldown bug in 26.1.2 (See notes)
-    Fixed server-side diminished returns state being evicted too early, allowing reconnects to bypass the DR window (See notes)
     Added option to allow Magic Hunter (Fishing) to grant items with conflicting enchantments; disabled by default (Thanks Warriorrrr)
     Added 'Skills.Fishing.Allow_Conflicting_Enchants' to config.yml (Thanks Warriorrrr)
     (Codebase) Removed 27 dead JSON.* locale keys from all locale files (See notes)

src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

@@ -98,8 +98,7 @@ public PlayerProfile(@NotNull String playerName, @Nullable UUID uuid,
         this.playerName = playerName;
         this.uuid = uuid;
         this.scoreboardTipsShown = scoreboardTipsShown;
-        // This constructor is used for save copies only — do not pull DR state from cache.
-        this.diminishedReturnsState = DiminishedReturnsCache.getOrCreate(null);
+        this.diminishedReturnsState = DiminishedReturnsCache.getOrCreate(uuid);
 
         skills.putAll(levelData);
         skillsXp.putAll(xpData);

src/test/java/com/gmail/nossr50/datatypes/experience/DiminishedReturnsCacheTest.java

@@ -11,7 +11,13 @@
 import static org.mockito.Mockito.when;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.player.UniqueDataType;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import java.lang.reflect.Field;
+import java.util.EnumMap;
+import java.util.Map;
 import java.util.UUID;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -288,4 +294,29 @@ void stateWithFutureExpiryHasActiveEntries() throws Exception {
                     "state with a future latestExpiryTimeMillis should report active entries");
         }
     }
+
+    @Nested
+    class PlayerProfileConstructorIntegration {
+
+        @Test
+        void mapBasedConstructorShouldUseUuidCacheState() {
+            // Given - a player UUID with an existing cached DR state
+            final UUID playerUuid = UUID.randomUUID();
+            final DiminishedReturnsState cachedState = DiminishedReturnsCache.getOrCreate(playerUuid);
+
+            final Map<PrimarySkillType, Integer> levelData = new EnumMap<>(PrimarySkillType.class);
+            final Map<PrimarySkillType, Float> xpData = new EnumMap<>(PrimarySkillType.class);
+            final Map<SuperAbilityType, Integer> cooldownData = new EnumMap<>(SuperAbilityType.class);
+            final Map<UniqueDataType, Integer> uniqueData = new EnumMap<>(UniqueDataType.class);
+
+            // When - profile is created using the map-based constructor used by DB loaders
+            final PlayerProfile loadedProfile = new PlayerProfile("TestPlayer", playerUuid,
+                    levelData, xpData, cooldownData, 0, uniqueData, null);
+            loadedProfile.registerXpGain(PrimarySkillType.MINING, 50F);
+
+            // Then - cached state should reflect the XP registered by that loaded profile
+            assertEquals(50F, cachedState.getRegisteredXpGain(PrimarySkillType.MINING),
+                    "loaded profiles with UUID must use the UUID-cached DR state");
+        }
+    }
 }