1 files changed, 12 insertions, 10 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
index 4af5ff9..b5e7e34 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
@@ -1,6 +1,7 @@
 package net.tylermurphy.hideAndSeek.util;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.database.Database;
 import net.tylermurphy.hideAndSeek.database.PlayerInfo;
 import org.bukkit.OfflinePlayer;
@@ -35,42 +36,43 @@ public class PAPIExpansion extends PlaceholderExpansion  {
 
     @Override
     public String onRequest(OfflinePlayer player, @NotNull String params) {
+        Database database = Main.getInstance().getDatabase();
         String[] args = params.split("_");
         if (args.length < 1) return null;
         if (args[0].equals("stats") && args.length == 2) {
-            PlayerInfo info = Database.playerInfo.getInfo(player.getUniqueId());
+            PlayerInfo info = database.getGameData().getInfo(player.getUniqueId());
             return getValue(info, args[1]);
         } else if (args[0].equals("stats") && args.length == 3) {
             UUID uuid;
-            try { uuid = UUIDFetcher.getUUID(args[2]); } catch (Exception e) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfo(uuid);
+            try { uuid = Main.getInstance().getServer().getOfflinePlayer(args[2]).getUniqueId(); } catch (Exception e) { return placeholderError; }
+            PlayerInfo info = database.getGameData().getInfo(uuid);
             return getValue(info, args[1]);
         } else if ((args[0].equals("rank-score") || args[0].equals("rank-name") ) && args.length == 3) {
             int place;
             try { place = Integer.parseInt(args[2]); } catch (NumberFormatException e) { return placeholderError; }
             if (place < 1) { return placeholderError; }
             if (getRanking(args[1]) == null) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfoRanking(getRanking(args[1]), place);
+            PlayerInfo info = database.getGameData().getInfoRanking(getRanking(args[1]), place);
             if (info == null) return placeholderNoData;
             if (args[0].equals("rank-score")) {
                 return getValue(info, args[1]);
             } else {
-                return UUIDFetcher.getPlayer(info.uuid).getName();
+                return Main.getInstance().getServer().getOfflinePlayer(info.uuid).getName();
             }
         } else if (args[0].equals("rank-place") && args.length == 2) {
             if (getRanking(args[1]) == null) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfo(player.getUniqueId());
+            PlayerInfo info = database.getGameData().getInfo(player.getUniqueId());
             if (getValue(info, args[1]).equals("0")) { return "-"; }
-            Integer count = Database.playerInfo.getRanking(getRanking(args[1]), player.getUniqueId());
+            Integer count = database.getGameData().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; }
+            try { uuid = Main.getInstance().getServer().getOfflinePlayer(args[2]).getUniqueId(); } catch (Exception e) { return placeholderError; }
             if (getRanking(args[1]) == null) { return placeholderError; }
-            PlayerInfo info = Database.playerInfo.getInfo(player.getUniqueId());
+            PlayerInfo info = database.getGameData().getInfo(player.getUniqueId());
             if (getValue(info, args[1]).equals("0")) { return "-"; }
-            Integer count = Database.playerInfo.getRanking(getRanking(args[1]), uuid);
+            Integer count = database.getGameData().getRanking(getRanking(args[1]), uuid);
             if (count == null) { return placeholderNoData; }
             return count.toString();
         }