From b64f117d4b9be998b9a9124089e628655a26cbdd Mon Sep 17 00:00:00 2001 From: Zrips Date: Wed, 2 Aug 2017 12:33:07 +0300 Subject: [PATCH] Inform when trying to use incorrect command name --- pom.xml | 2 +- .../gamingmesh/jobs/commands/JobsCommands.java | 15 +++++++++++---- .../gamingmesh/jobs/config/LanguageManager.java | 1 + src/main/resources/plugin.yml | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 44bee5fe..0bda92dd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Jobs jobs - 4.0.0 + 4.0.1 Jobs http://maven.apache.org diff --git a/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java b/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java index f705f078..c98c2bda 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java +++ b/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java @@ -78,6 +78,13 @@ public class JobsCommands implements CommandExecutor { String cmd = args[0].toLowerCase(); + Cmd cmdClass = getCmdClass(cmd); + + if (cmdClass == null) { + sender.sendMessage(Jobs.getLanguage().getMessage("general.error.noCommand")); + return true; + } + if (!hasCommandPermission(sender, cmd)) { sender.sendMessage(Jobs.getLanguage().getMessage("general.error.permission")); return true; @@ -90,10 +97,10 @@ public class JobsCommands implements CommandExecutor { } } - Cmd cmdClass = getCmdClass(cmd); - if (cmdClass == null) { - return help(sender, 1); - } +// if (cmdClass == null) { +// return help(sender, 1); +// } + boolean back = cmdClass.perform(plugin, sender, myArgs); if (back) return true; diff --git a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java index 9c237bdc..b9bbca01 100644 --- a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java @@ -88,6 +88,7 @@ public class LanguageManager { c.get("general.error.noHelpPage", "&cThere is no help page by this number!"); c.get("general.error.notNumber", "&ePlease use numbers!"); c.get("general.error.job", "&cThe job you have selected does not exist!"); + c.get("general.error.noCommand", "&cThere is no command by this name!"); c.get("general.error.permission", "&cYou do not have permission to do that!"); c.get("general.error.noinfo", "&cNo information found!"); c.get("general.error.noinfoByPlayer", "&cNo information found by [%playername%] player name!"); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5d14a832..29ff2bf5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Jobs description: Jobs Plugin for the BukkitAPI main: com.gamingmesh.jobs.Jobs -version: 4.0.0 +version: 4.0.1 website: https://www.spigotmc.org/resources/jobs-reborn.4216/ author: phrstbrn softdepend: [Vault, iConomy, MythicMobs, McMMO, WorldGuard, MyPet]