Fixes #222

BentoBoxWorld · Jul 9, 2020 · 15655b8 · 15655b8
1 parent 445e5a0
commit 15655b8
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/challenges/ChallengesManager.java b/src/main/java/world/bentobox/challenges/ChallengesManager.java
@@ -1084,7 +1084,20 @@ private void resetChallenge(@NonNull String storageDataID, @NonNull String chall
     private void resetAllChallenges(@NonNull String storageDataID, @NonNull String gameMode)
     {
         this.addPlayerData(storageDataID);
-        this.playerCacheData.get(storageDataID).reset(gameMode);
+
+        if (this.playerCacheData.containsKey(storageDataID))
+        {
+            // There may be a rare situation when player data cannot be loaded. Just avoid
+            // error.
+            this.playerCacheData.get(storageDataID).reset(gameMode);
+        }
+        else
+        {
+            // If object cannot be loaded remove it completely.
+            this.playersDatabase.deleteID(storageDataID);
+            this.addon.logError("Database object was not loaded. It is removed completely. Object Id: " + storageDataID);
+        }
+
         // Save
         this.savePlayerData(storageDataID);
     }
@@ -1399,7 +1412,7 @@ public void resetAllChallenges(User user, World world)
      * @param world - World where challenges must be reset.
      * @param adminID - admin iD
      */
-    public void resetAllChallenges(UUID userID, World world, UUID adminID)
+    public void resetAllChallenges(@NonNull UUID userID, World world, @Nullable UUID adminID)
     {
         String storageID = this.getDataUniqueID(userID, Util.getWorld(world));