[Bug Fix] More small getName() to UUID fixes.

Author: MiracleM4n

src/main/java/ca/q0r/mchat/api/API.java

@@ -9,7 +9,6 @@
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
 import org.bukkit.Bukkit;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -226,8 +225,11 @@ public static String createBasicBar(float currentValue, float maxValue, float ba
      * @param node   Permission Node being checked.
      * @return Player has Node.
      */
-    public static Boolean checkPermissions(Player player, World world, String node) {
-        return checkPermissions(player.getUniqueId(), world.getName(), node) || player.hasPermission(node) || player.isOp();
+    public static Boolean checkPermissions(Player player, String world, String node) {
+        return vaultB && vPerm.has(player, node)
+                || gmB && gmWH.getWorldPermissions(player).has(player, node)
+                || pexB && pexPermissions.has(player, node, world)
+                || player.hasPermission(node) || player.isOp();
     }
 
     /**
@@ -238,6 +240,8 @@ public static Boolean checkPermissions(Player player, World world, String node)
      * @param node  Permission Node being checked.
      * @return Player has Node.
      */
+    @Deprecated
+    @SuppressWarnings("deprecation")
     public static Boolean checkPermissions(String pName, String world, String node) {
         return vaultB && vPerm.has(world, pName, node)
                 || gmB && gmWH.getWorldPermissions(pName).getPermissionBoolean(pName, node)
@@ -254,7 +258,7 @@ public static Boolean checkPermissions(String pName, String world, String node)
      * @return Player has Node.
      */
     public static Boolean checkPermissions(UUID uuid, String world, String node) {
-        return checkPermissions(Bukkit.getPlayer(uuid).getName(), world, node);
+        return checkPermissions(Bukkit.getPlayer(uuid), world, node);
     }
 
     /**

src/main/java/ca/q0r/mchat/events/ChatListener.java

@@ -11,6 +11,8 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
+import java.util.UUID;
+
 public class ChatListener implements Listener {
     private MChat plugin;
 
@@ -43,7 +45,7 @@ public void onPlayerChat(AsyncPlayerChatEvent event) {
             for (Player players : plugin.getServer().getOnlinePlayers()) {
                 if (players.getWorld() != player.getWorld()
                         || players.getLocation().distance(player.getLocation()) > ConfigType.MCHAT_CHAT_DISTANCE.getDouble()) {
-                    if (isSpy(players.getName(), players.getWorld().getName())) {
+                    if (isSpy(players.getUniqueId(), players.getWorld().getName())) {
                         players.sendMessage(eventFormat.replace(LocaleType.FORMAT_LOCAL.getVal(), LocaleType.FORMAT_FORWARD.getVal()));
                     }
 
@@ -55,13 +57,13 @@ public void onPlayerChat(AsyncPlayerChatEvent event) {
         event.setFormat(eventFormat);
     }
 
-    private Boolean isSpy(String player, String world) {
-        if (API.checkPermissions(player, world, "mchat.spy")) {
-            API.getSpying().put(player, true);
+    private Boolean isSpy(UUID uuid, String world) {
+        if (API.checkPermissions(uuid, world, "mchat.spy")) {
+            API.getSpying().put(uuid.toString(), true);
             return true;
         }
 
-        API.getSpying().put(player, false);
+        API.getSpying().put(uuid.toString(), false);
         return false;
     }
 

src/main/java/ca/q0r/mchat/util/CommandUtil.java

@@ -7,6 +7,8 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 /**
  * Command Utility Class. Used for Command related tasks.
  */
@@ -34,6 +36,8 @@ public static Boolean hasCommandPerm(CommandSender sender, String permission) {
      * @param player Player to check for.
      * @return Result of Online Check.
      */
+    @Deprecated
+    @SuppressWarnings("deprecation")
     public static Boolean isOnlineForCommand(CommandSender sender, String player) {
         if (Bukkit.getServer().getPlayer(player) == null) {
             MessageUtil.sendMessage(sender, "&4Player &e'" + player + "'&4 not Found.");
@@ -43,6 +47,24 @@ public static Boolean isOnlineForCommand(CommandSender sender, String player) {
         return true;
     }
 
+    /**
+     * Checks if player is online before sending command.
+     *
+     * @param sender Object sending command.
+     * @param uuid UUID to check for.
+     * @return Result of Online Check.
+     */
+    @Deprecated
+    @SuppressWarnings("deprecation")
+    public static Boolean isOnlineForCommand(CommandSender sender, UUID uuid) {
+        if (API.getPlayer(uuid.toString()) == null) {
+            MessageUtil.sendMessage(sender, "&4Player &e'" + uuid + "'&4 not Found.");
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Checks if player is online before sending command.
      *