TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-10-03 15:24:21 +00:00
Code Issues Projects Releases Wiki Activity

[Fix] Try singular and plural entity names in /remove.

Browse source
This commit is contained in:
KHobbits 2013-04-28 04:26:39 +01:00
parent e60f17bb53
commit 3396cf6e02
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Essentials/src/com/earth2me/essentials/commands/Commandremove.java
View file

@ -51,7 +51,7 @@ public class Commandremove extends EssentialsCommand
throw new Exception(_("numberRequired"), e); throw new Exception(_("numberRequired"), e);
} }
} }
if (args.length >= 3) if (args.length >= 3)
{ {
world = ess.getWorld(args[2]); world = ess.getWorld(args[2]);
@ -63,7 +63,14 @@ public class Commandremove extends EssentialsCommand
} }
catch (IllegalArgumentException e) 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); removeEntities(user, world, toRemove, radius);
@ -85,7 +92,14 @@ public class Commandremove extends EssentialsCommand
} }
catch (IllegalArgumentException e) 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); removeEntities(sender, world, toRemove, 0);
} }