From 2f055fbecb68a63512347880b441a88e43495aa3 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 28 Jun 2014 12:00:16 +0200 Subject: [PATCH] /gadmin: return false if required args are not present. Resolves #220 --- buildnumber.properties | 4 ++-- src/bans.yml | 2 +- .../TotalFreedomMod/Commands/Command_gadmin.java | 11 +++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 28912569..c0e4159a 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Jun 28 11:45:35 CEST 2014 -build.number=887 +#Sat Jun 28 11:59:25 CEST 2014 +build.number=888 diff --git a/src/bans.yml b/src/bans.yml index 23b693a5..742a3162 100644 --- a/src/bans.yml +++ b/src/bans.yml @@ -1,6 +1,6 @@ # # TotalFreedomMod banning config -# Warning: modification of this file is not recomended +# Warning: modification of this file is not recommended # # Format: # Ip: [IP-address / UUID]:[Last login name]:[Expiry unix timestamp (0 = never)][Banned by]:[Reason] diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java index 309cac44..51845f3c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java @@ -25,7 +25,7 @@ public class Command_gadmin extends TFM_Command return false; } - String mode = args[0].toLowerCase(); + final String mode = args[0].toLowerCase(); if (mode.equals("list")) { @@ -42,7 +42,14 @@ public class Command_gadmin extends TFM_Command ChatColor.stripColor(player.getDisplayName()), hash)); } - else if (hash.equalsIgnoreCase(args[1])) + + if (args.length < 2) + { + return false; + } + + + if (hash.equalsIgnoreCase(args[1])) { if (mode.equals("kick")) {