From 3396cf6e023e2ec12adbc0a8ed84a6715e227935 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 28 Apr 2013 04:26:39 +0100 Subject: [PATCH] [Fix] Try singular and plural entity names in /remove. --- .../essentials/commands/Commandremove.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java index 2e7394c90..dc1119242 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java @@ -51,7 +51,7 @@ public class Commandremove extends EssentialsCommand throw new Exception(_("numberRequired"), e); } } - + if (args.length >= 3) { world = ess.getWorld(args[2]); @@ -63,7 +63,14 @@ public class Commandremove extends EssentialsCommand } catch (IllegalArgumentException e) { - throw new NotEnoughArgumentsException(e); //TODO: translate and list types + try + { + toRemove = ToRemove.valueOf(args[0].concat("S").toUpperCase(Locale.ENGLISH)); + } + catch (IllegalArgumentException ee) + { + throw new NotEnoughArgumentsException(ee); //TODO: translate and list types + } } removeEntities(user, world, toRemove, radius); @@ -85,7 +92,14 @@ public class Commandremove extends EssentialsCommand } catch (IllegalArgumentException e) { - throw new NotEnoughArgumentsException(e); //TODO: translate and list types + try + { + toRemove = ToRemove.valueOf(args[0].concat("S").toUpperCase(Locale.ENGLISH)); + } + catch (IllegalArgumentException ee) + { + throw new NotEnoughArgumentsException(ee); //TODO: translate and list types + } } removeEntities(sender, world, toRemove, 0); }