diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-04-28 04:26:39 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-04-28 04:26:39 +0100 |
| commit | 0e8e6178fcc3ff16074b3bf479fbac219327bbe6 (patch) | |
| tree | b6011bdf339f7de629bb4c88111f791095506ef6 | |
| parent | 70a364894f1290147458f6de9ca91328559ffa77 (diff) | |
| download | Essentials-0e8e6178fcc3ff16074b3bf479fbac219327bbe6.tar Essentials-0e8e6178fcc3ff16074b3bf479fbac219327bbe6.tar.gz Essentials-0e8e6178fcc3ff16074b3bf479fbac219327bbe6.tar.lz Essentials-0e8e6178fcc3ff16074b3bf479fbac219327bbe6.tar.xz Essentials-0e8e6178fcc3ff16074b3bf479fbac219327bbe6.zip | |
[Fix] Try singular and plural entity names in /remove.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandremove.java | 20 |
1 files 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); } |