diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitUtilities.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitUtilities.java index d9cd1be..be131cb 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitUtilities.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitUtilities.java @@ -18,13 +18,15 @@ public class BukkitUtilities } public static OfflinePlayer findOfflinePlayer(String player) { + final String srcUniqueId = player.replace("-", "").toLowerCase(); OfflinePlayer result = null; for(OfflinePlayer offline : Bukkit.getOfflinePlayers()) { try { - // Immediately return if UUID is the same - if(offline.getUniqueId().toString().replace("-", "").equalsIgnoreCase(player)) + // Immediately return if UUID is the same\ + final String dstUniqueId = offline.getUniqueId().toString().replace("-", ""); + if(dstUniqueId.equalsIgnoreCase(srcUniqueId)) { result = offline; break; diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java index 5353c3c..b64dbf7 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java @@ -152,22 +152,22 @@ public class BukkitCommands return; case "lock": cmdLock.executeLock(sender, args); - return; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "unlock": cmdLock.executeUnlock(sender); - return; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "fetch": cmdReload.executeFetch(sender); - return; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "reload": cmdReload.executeReload(sender); - return; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "update": cmdReload.executeUpdate(sender, args); - return; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "debug": cmdDebug.execute(sender, args); - return; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "examplerows": /* DEPRECATED: rscp examplerows */ if(sender.hasPermission("rscp.admin")) @@ -175,7 +175,7 @@ public class BukkitCommands threadInsertExampleRows(sender); throw new CommandAnswerException("Example rows have been added into database."); } - break; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "import": /* DEPRECATED: rscp import pex-sql*/ if(sender.hasPermission("rscp.admin")) @@ -196,7 +196,7 @@ public class BukkitCommands break; } } - return; + throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString()); case "help": default: break; diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java index 607332a..9d9303c 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java @@ -65,8 +65,8 @@ public class CommandEntity extends CommandEntityHelper templt.add("{_YL}/rscp {:T} [new] removepermission "); templt.add("{_YL}[options] {_LS}can be:"); templt.add("{_LS}1. {_WH}destination {_LS} -- it is destination, yes."); - templt.add("{_LS}2. {_WH}expirience {_LS} -- NOT WORKING."); - templt.add("{_LS}3. {_WH}lifitime {_LS} -- NOT READY, will be like '1hours12min30s'."); + // templt.add("{_LS}2. {_WH}expirience {_LS} -- NOT WORKING."); + // templt.add("{_LS}3. {_WH}lifetime