From 137b60c5f2385d7085fec072a7a6c0115274aaa1 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 28 Jan 2012 01:32:15 +0000 Subject: Allow space as well as : in /delhome --- .../earth2me/essentials/commands/Commanddelhome.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java index ce891985e..c4d0a6946 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java @@ -15,7 +15,7 @@ public class Commanddelhome extends EssentialsCommand } @Override - public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception + public void run(final Server server, final CommandSender sender, final String commandLabel, String[] args) throws Exception { if (args.length < 1) { @@ -24,7 +24,18 @@ public class Commanddelhome extends EssentialsCommand User user = ess.getUser(sender); String name; - final String[] expandedArg = args[0].split(":"); + String[] expandedArg; + + //Allowing both formats /sethome khobbits house | /sethome khobbits:house + final String[] nameParts = args[0].split(":"); + if (nameParts[0].length() != args[0].length()) + { + expandedArg = nameParts; + } + else + { + expandedArg = args; + } if (expandedArg.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others"))) { @@ -41,9 +52,7 @@ public class Commanddelhome extends EssentialsCommand } //TODO: Think up a nice error message /* - * if (name.equalsIgnoreCase("bed")) { - * throw new Exception("You cannot remove the vanilla home point"); - * } + * if (name.equalsIgnoreCase("bed")) { throw new Exception("You cannot remove the vanilla home point"); } */ user.delHome(name.toLowerCase(Locale.ENGLISH)); sender.sendMessage(_("deleteHome", name)); -- cgit v1.2.3