Merge pull request #68 from tylermurphy534/1.5.0

1.5.0 

1 files changed, 19 insertions, 14 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java
index 760bb2c..6125a00 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java
@@ -20,47 +20,52 @@
 package net.tylermurphy.hideAndSeek.command;
 
 import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.database.Database;
-import net.tylermurphy.hideAndSeek.database.PlayerInfo;
+import net.tylermurphy.hideAndSeek.database.util.PlayerInfo;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 
 import java.util.List;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
+import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
+import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
 
 public class Top implements ICommand {
 
-    public void execute(CommandSender sender, String[] args) {
+    public void execute(Player sender, String[] args) {
         int page;
-        if(args.length == 0) page = 1;
+        if (args.length == 0) page = 1;
         else try{
             page = Integer.parseInt(args[0]);
-        } catch(Exception e){
+        } catch(Exception e) {
             sender.sendMessage(errorPrefix + message("WORLDBORDER_INVALID_INPUT").addAmount(args[0]));
             return;
         }
-        if(page < 1){
+        if (page < 1) {
             sender.sendMessage(errorPrefix + message("WORLDBORDER_INVALID_INPUT").addAmount(page));
             return;
         }
         StringBuilder message = new StringBuilder(String.format(
                 "%s------- %sLEADERBOARD %s(Page %s) %s-------\n",
                 ChatColor.WHITE, ChatColor.BOLD, ChatColor.GRAY, page, ChatColor.WHITE));
-        List<PlayerInfo> infos = Database.playerInfo.getInfoPage(page);
+        List<PlayerInfo> infos = Main.getInstance().getDatabase().getGameData().getInfoPage(page);
         int i = 1 + (page-1)*10;
-        for(PlayerInfo info : infos){
-            String name = Main.plugin.getServer().getOfflinePlayer(info.uuid).getName();
+        if (infos == null) {
+            sender.sendMessage(errorPrefix + message("NO_GAME_INFO"));
+            return;
+        }
+        for(PlayerInfo info : infos) {
+            String name = Main.getInstance().getDatabase().getNameData().getName(info.getUniqueId());
             ChatColor color;
-            switch (i){
+            switch (i) {
                 case 1: color = ChatColor.YELLOW; break;
                 case 2: color = ChatColor.GRAY; break;
                 case 3: color = ChatColor.GOLD; break;
                 default: color = ChatColor.WHITE; break;
             }
             message.append(String.format("%s%s. %s%s %s%s\n",
-                    color, i, ChatColor.RED, info.wins, ChatColor.WHITE, name));
+                    color, i, ChatColor.RED, info.getSeekerWins() +info.getHiderWins(), ChatColor.WHITE, name));
             i++;
         }
         sender.sendMessage(message.toString());