diff options
| author | bobby29831 <84546230+bobby29831@users.noreply.github.com> | 2022-05-14 22:27:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-14 22:27:34 -0500 |
| commit | d3e81515345f846ab531a4a0ff36117c624618ae (patch) | |
| tree | 644a3745e322f9ce32cd455250ef8241436f7fed /src/main/java/net/tylermurphy/hideAndSeek/util | |
| parent | refactor: simplify Locations.java class (diff) | |
| parent | debug menu and 1.8/1.14 fixes (diff) | |
| download | kenshinshideandseek-d3e81515345f846ab531a4a0ff36117c624618ae.tar.gz kenshinshideandseek-d3e81515345f846ab531a4a0ff36117c624618ae.tar.bz2 kenshinshideandseek-d3e81515345f846ab531a4a0ff36117c624618ae.zip | |
Merge branch 'tylermurphy534:1.4.3' into 1.4.3
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/util')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java index 6034607..1f0c8a3 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java @@ -62,16 +62,20 @@ public class CommandHandler { registerCommand(new Leave()); registerCommand(new Top()); registerCommand(new Wins()); + registerCommand(new Debug()); } public static boolean handleCommand(CommandSender sender, String[] args) { if (!(sender instanceof Player)) { sender.sendMessage(errorPrefix + message("COMMAND_PLAYER_ONLY")); - } else if (args.length < 1 || !COMMAND_REGISTER.containsKey(args[0].toLowerCase()) ) { + return true; + } + Player player = (Player) sender; + if (args.length < 1 || !COMMAND_REGISTER.containsKey(args[0].toLowerCase()) ) { if (permissionsRequired && !sender.hasPermission("hideandseek.about")) { sender.sendMessage(errorPrefix + LOCAL.get("")); } else { - COMMAND_REGISTER.get("about").execute(sender, null); + COMMAND_REGISTER.get("about").execute(player, null); } } else { if (!args[0].equalsIgnoreCase("about") && !args[0].equalsIgnoreCase("help") && SaveMap.runningBackup) { @@ -80,7 +84,7 @@ public class CommandHandler { sender.sendMessage(errorPrefix + message("COMMAND_NOT_ALLOWED")); } else { try { - COMMAND_REGISTER.get(args[0].toLowerCase()).execute(sender,Arrays.copyOfRange(args, 1, args.length)); + COMMAND_REGISTER.get(args[0].toLowerCase()).execute(player,Arrays.copyOfRange(args, 1, args.length)); } catch (Exception e) { sender.sendMessage(errorPrefix + "An error has occurred."); e.printStackTrace(); |