Merge branch 'master' into develop

BentoBoxWorld · May 5, 2024 · e2cbd18 · e2cbd18
2 parents 4d16e9c + 3061e80
commit e2cbd18
Show file tree

Hide file tree

Showing 2 changed files with 152 additions and 151 deletions.
diff --git a/src/main/java/world/bentobox/level/LevelsManager.java b/src/main/java/world/bentobox/level/LevelsManager.java
@@ -39,12 +39,12 @@ public class LevelsManager {
     private static final TreeMap<BigInteger, String> LEVELS;
     private static final BigInteger THOUSAND = BigInteger.valueOf(1000);
     static {
-        LEVELS = new TreeMap<>();
+	LEVELS = new TreeMap<>();
 
-        LEVELS.put(THOUSAND, "k");
-        LEVELS.put(THOUSAND.pow(2), "M");
-        LEVELS.put(THOUSAND.pow(3), "G");
-        LEVELS.put(THOUSAND.pow(4), "T");
+	LEVELS.put(THOUSAND, "k");
+	LEVELS.put(THOUSAND.pow(2), "M");
+	LEVELS.put(THOUSAND.pow(3), "G");
+	LEVELS.put(THOUSAND.pow(4), "T");
     }
     private final Level addon;
 
@@ -58,15 +58,15 @@ public class LevelsManager {
     private Map<World, CachedData> cache = new HashMap<>();
 
     public LevelsManager(Level addon) {
-        this.addon = addon;
-        // Get the BentoBox database
-        // Set up the database handler to store and retrieve data
-        // Note that these are saved by the BentoBox database
-        handler = new Database<>(addon, IslandLevels.class);
-        // Initialize the cache
-        levelsCache = new HashMap<>();
-        // Initialize top ten lists
-        topTenLists = new ConcurrentHashMap<>();
+	this.addon = addon;
+	// Get the BentoBox database
+	// Set up the database handler to store and retrieve data
+	// Note that these are saved by the BentoBox database
+	handler = new Database<>(addon, IslandLevels.class);
+	// Initialize the cache
+	levelsCache = new HashMap<>();
+	// Initialize top ten lists
+	topTenLists = new ConcurrentHashMap<>();
     }
 
     public void migrate() {
@@ -208,7 +208,7 @@ public String formatLevel(@Nullable Long lvl) {
      * @return initial level of island
      */
     public long getInitialLevel(Island island) {
-        return getLevelsData(island).getInitialLevel();
+	return getLevelsData(island).getInitialLevel();
     }
 
     /**
@@ -252,7 +252,7 @@ public long getIslandMaxLevel(@NonNull World world, @Nullable UUID targetPlayer)
      *         null
      */
     public String getIslandLevelString(@NonNull World world, @Nullable UUID targetPlayer) {
-        return formatLevel(getIslandLevel(world, targetPlayer));
+	return formatLevel(getIslandLevel(world, targetPlayer));
     }
 
     /**
@@ -263,24 +263,24 @@ public String getIslandLevelString(@NonNull World world, @Nullable UUID targetPl
      */
     @NonNull
     public IslandLevels getLevelsData(@NonNull Island island) {
-        String id = island.getUniqueId();
-        if (levelsCache.containsKey(id)) {
-            return levelsCache.get(id);
-        }
-        // Get from database if not in cache
-        if (handler.objectExists(id)) {
-            IslandLevels ld = handler.loadObject(id);
-            if (ld != null) {
-                levelsCache.put(id, ld);
-            } else {
-                handler.deleteID(id);
-                levelsCache.put(id, new IslandLevels(id));
-            }
-        } else {
-            levelsCache.put(id, new IslandLevels(id));
-        }
-        // Return cached value
-        return levelsCache.get(id);
+	String id = island.getUniqueId();
+	if (levelsCache.containsKey(id)) {
+	    return levelsCache.get(id);
+	}
+	// Get from database if not in cache
+	if (handler.objectExists(id)) {
+	    IslandLevels ld = handler.loadObject(id);
+	    if (ld != null) {
+		levelsCache.put(id, ld);
+	    } else {
+		handler.deleteID(id);
+		levelsCache.put(id, new IslandLevels(id));
+	    }
+	} else {
+	    levelsCache.put(id, new IslandLevels(id));
+	}
+	// Return cached value
+	return levelsCache.get(id);
     }
 
     /**
@@ -329,7 +329,6 @@ public Map<Island, Long> getWeightedTopTen(@NonNull World world, int size) {
 
         // Return the unmodifiable map
         return Collections.unmodifiableMap(weightedTopTen);
-
     }
 
     /**
@@ -430,12 +429,11 @@ public void loadTopTens() {
      * @param uuid  - the island's uuid
      */
     public void removeEntry(World world, String uuid) {
-        if (topTenLists.containsKey(world)) {
+       if (topTenLists.containsKey(world)) {
             topTenLists.get(world).getTopTen().remove(uuid);
             // Invalidate the cache because of this deletion
             cache.remove(world);
         }
-
     }
 
     /**
@@ -506,8 +504,8 @@ private void setIslandResults(Island island, Results r) {
      * @param uniqueId - id of island
      */
     public void deleteIsland(String uniqueId) {
-        levelsCache.remove(uniqueId);
-        handler.deleteID(uniqueId);
+	levelsCache.remove(uniqueId);
+	handler.deleteID(uniqueId);
     }
 
 }