2 files changed, 17 insertions, 12 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java
index caa751b..9b55c9f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java
@@ -22,6 +22,7 @@ package net.tylermurphy.hideAndSeek.command;
 import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.database.util.PlayerInfo;
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -54,7 +55,13 @@ public class Top implements ICommand {
             return;
         }
         for(PlayerInfo info : infos) {
-            String name = Main.getInstance().getServer().getOfflinePlayer(info.getUniqueId()).getName();
+            OfflinePlayer temp = Main.getInstance().getServer().getOfflinePlayer(info.getUniqueId());
+            String name;
+            if(temp == null){
+                name = Main.getInstance().getDatabase().getNameData().getName(info.getUniqueId());
+            } else {
+                name = temp.getName();
+            }
             ChatColor color;
             switch (i) {
                 case 1: color = ChatColor.YELLOW; break;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Wins.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Wins.java
index 8a0b6dc..491c9a4 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Wins.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Wins.java
@@ -37,23 +37,21 @@ public class Wins implements ICommand {
             UUID uuid;
             String name;
             if (args.length == 0) {
-                Player player = Main.getInstance().getServer().getPlayer(sender.getName());
-                if (player == null) {
-                    sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(sender.getName()));
-                    return;
-                }
-                uuid = player.getUniqueId();
+                uuid = sender.getUniqueId();
                 name = sender.getName();
             }
             else {
-                try {
-                    name = args[0];
+                name = args[0];
+                if(Main.getInstance().getServer().getOfflinePlayer(args[0]) == null){
+                    uuid = Main.getInstance().getDatabase().getNameData().getUUID(args[0]);
+                } else {
                     uuid = Main.getInstance().getServer().getOfflinePlayer(args[0]).getUniqueId();
-                } catch (Exception e) {
-                    sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(args[0]));
-                    return;
                 }
             }
+            if(uuid == null){
+                sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(args[0]));
+                return;
+            }
             PlayerInfo info = Main.getInstance().getDatabase().getGameData().getInfo(uuid);
             if (info == null) {
                 sender.sendMessage(errorPrefix + message("NO_GAME_INFO"));