rank-place placeholder, fix null pointer in sql

1 files changed, 12 insertions, 0 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
index 311fcee..d467b62 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
@@ -57,6 +57,18 @@ public class PAPIExpansion extends PlaceholderExpansion  {
             } else {
                 return UUIDFetcher.getPlayer(info.uuid).getName();
             }
+        } else if(args[0].equals("rank-place") && args.length == 2){
+            if(getRanking(args[1]) == null) { return placeholderError; }
+            Integer count = Database.playerInfo.getRanking(getRanking(args[1]), player.getUniqueId());
+            if(count == null) { return placeholderNoData; }
+            return count.toString();
+        } else if(args[0].equals("rank-place") && args.length == 3){
+            UUID uuid;
+            try { uuid = UUIDFetcher.getUUID(args[2]); } catch (Exception e) { return placeholderError; }
+            if(getRanking(args[1]) == null) { return placeholderError; }
+            Integer count = Database.playerInfo.getRanking(getRanking(args[1]), uuid);
+            if(count == null) { return placeholderNoData; }
+            return count.toString();
         }
         return null;
     }