From 8f6d71fffbff1aae70f6025506a2cc4f40995d45 Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Fri, 12 Jul 2013 21:51:03 +0200 Subject: [PATCH] Bleeding - Fixed empty commands Empty commands would always run the first alphabetically sorted TFM command. --- appinfo.properties | 6 +++--- buildnumber.properties | 4 ++-- .../TotalFreedomMod/Commands/Command_adminmode.java | 5 +++++ src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index 39e971f4..e3a40929 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Wed, 10 Jul 2013 23:43:28 +0200 +#Wed, 10 Jul 2013 23:58:09 +0200 program.VERSION=2.21 -program.BUILDNUM=297 -program.BUILDDATE=07/10/2013 11\:43 PM +program.BUILDNUM=301 +program.BUILDDATE=07/10/2013 11\:58 PM diff --git a/buildnumber.properties b/buildnumber.properties index c232fcf2..624e87d0 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Jul 10 23:43:28 CEST 2013 -build.number=298 +#Wed Jul 10 23:58:09 CEST 2013 +build.number=302 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java index ddc160f3..4e7ca18d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java @@ -14,6 +14,11 @@ public class Command_adminmode extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { + if (args.length != 1) + { + return false; + } + if (args[0].equalsIgnoreCase("off")) { TotalFreedomMod.adminOnlyMode = false; diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index c49a3724..4ea70f64 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -159,6 +159,11 @@ public class TotalFreedomMod extends JavaPlugin commandLabel, StringUtils.join(args, " ")), true); } + + if ("".equals(commandLabel)) + { + return false; + } TFM_Command dispatcher; try