From a5abd1067816cb8259e67f7bf433f39034c7a07d Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sun, 19 Apr 2020 15:49:16 -0700
Subject: [PATCH] Fixes placeholders.

---
 src/main/java/world/bentobox/level/Level.java              | 1 +
 src/main/java/world/bentobox/level/TopTen.java             | 4 ++--
 src/main/java/world/bentobox/level/objects/TopTenData.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/world/bentobox/level/Level.java b/src/main/java/world/bentobox/level/Level.java
index a1929fb..3b615f5 100644
--- a/src/main/java/world/bentobox/level/Level.java
+++ b/src/main/java/world/bentobox/level/Level.java
@@ -282,6 +282,7 @@ public class Level extends Addon {
     }
 
     private String getVisitedIslandLevel(GameModeAddon gm, User user) {
+        if (!gm.inWorld(user.getLocation())) return "";
         return getIslands().getIslandAt(user.getLocation())
                 .map(island -> getLevelPresenter().getLevelString(getIslandLevel(gm.getOverWorld(), island.getOwner())))
                 .orElse("0");
diff --git a/src/main/java/world/bentobox/level/TopTen.java b/src/main/java/world/bentobox/level/TopTen.java
index 805a6d0..286792f 100644
--- a/src/main/java/world/bentobox/level/TopTen.java
+++ b/src/main/java/world/bentobox/level/TopTen.java
@@ -53,6 +53,7 @@ public class TopTen implements Listener {
             World world = Bukkit.getWorld(tt.getUniqueId());
             if (world != null) {
                 topTenList.put(world, tt);
+                addon.log("Loaded TopTen for " + world.getName());
             } else {
                 addon.logError("TopTen world " + tt.getUniqueId() + " is not known on server. Skipping...");
             }
@@ -156,8 +157,7 @@ public class TopTen implements Listener {
      */
     @NonNull
     public TopTenData getTopTenList(World world) {
-        topTenList.putIfAbsent(world, new TopTenData());
-        return topTenList.get(world);
+        return topTenList.computeIfAbsent(world, k -> new TopTenData());
     }
 
     /**
diff --git a/src/main/java/world/bentobox/level/objects/TopTenData.java b/src/main/java/world/bentobox/level/objects/TopTenData.java
index 7ade3e3..a4f5c38 100644
--- a/src/main/java/world/bentobox/level/objects/TopTenData.java
+++ b/src/main/java/world/bentobox/level/objects/TopTenData.java
@@ -41,7 +41,7 @@ public class TopTenData implements DataObject {
      */
     public long getTopTenLevel(int rank) {
         Map<UUID, Long> tt = getTopTen();
-        return tt.size() < rank ? (long)tt.values().toArray()[(rank-1)] : 0;
+        return rank <= tt.size() ? (long)tt.values().toArray()[(rank-1)] : 0;
     }
 
     /**
@@ -52,7 +52,7 @@ public class TopTenData implements DataObject {
     @Nullable
     public UUID getTopTenUUID(int rank) {
         Map<UUID, Long> tt = getTopTen();
-        return tt.size() < rank ? (UUID)tt.keySet().toArray()[(rank-1)] : null;
+        return rank <= tt.size() ? (UUID)tt.keySet().toArray()[(rank-1)] : null;
     }
 
     public void setTopTen(Map<UUID, Long> topTen) {