Merge pull request #47 from PlaceholderAPI/baltop-up

fix(baltop): Moved baltop above player null check

src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java

@@ -25,6 +25,7 @@ import com.earth2me.essentials.Kit;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.DescParseTickFormat;
+import com.google.common.collect.Streams;
 import com.google.common.primitives.Ints;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -40,10 +41,8 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.IntStream;
 import java.util.stream.StreamSupport;
 
 public class EssentialsExpansion extends PlaceholderExpansion {
@@ -102,8 +101,8 @@ public class EssentialsExpansion extends PlaceholderExpansion {
         final String papiTrue = PlaceholderAPIPlugin.booleanTrue();
         final String papiFalse = PlaceholderAPIPlugin.booleanFalse();
 
+        // Put this before the null check as most of it is not required
         if (identifier.startsWith("baltop_")) {
-            BalanceTop baltop = essentials.getBalanceTop();
             Map<UUID, BalanceTop.Entry> baltopCache = baltop.getBalanceTopCache();
             identifier = identifier.substring(7);
 
@@ -182,11 +181,20 @@ public class EssentialsExpansion extends PlaceholderExpansion {
                 return entries[id].getDisplayName();
             }
 
+            if (identifier.equals("rank")) {
+                // Another null check because it is above the normal one
+                if (player == null) return "";
+
+                if (!baltopCache.containsKey(player.getUniqueId())) {
+                    return "";
+                }
+
+                return String.valueOf(new ArrayList<>(baltopCache.keySet()).indexOf(player.getUniqueId()) + 1);
+            }
+
             return null;
         }
 
-
-
         if (player == null) return "";
 
         if (identifier.startsWith("kit_last_use_")) {
@@ -301,13 +309,13 @@ public class EssentialsExpansion extends PlaceholderExpansion {
 
                     switch (identifier.charAt(identifier.length() - 1)) {
                         case 'x':
-                            stringBuilder.append(home.getX()).append(".5");
+                            stringBuilder.append(home.getX());
                             break;
                         case 'y':
                             stringBuilder.append((int) home.getY());
                             break;
                         case 'z':
-                            stringBuilder.append(home.getZ()).append(".5");
+                            stringBuilder.append(home.getZ());
                             break;
                     }