Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-30 03:51:26 +01:00
Code Issues Projects Releases Wiki Activity

Show warning when invalid mob type is specified for /remove

Browse Source
This commit is contained in:
KHobbits 2013-12-07 19:03:29 +00:00
parent 723e458a81
commit 5b64c31e86
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Essentials/src/com/earth2me/essentials/commands/Commandremove.java
View File

@ -71,23 +71,23 @@ public class Commandremove extends EssentialsCommand
} }
else else
{ {
for (String s : args[0].split(",")) for (String entityType : args[0].split(","))
{ {
ToRemove toRemove; ToRemove toRemove;
try try
{ {
toRemove = ToRemove.valueOf(s.toUpperCase(Locale.ENGLISH)); toRemove = ToRemove.valueOf(entityType.toUpperCase(Locale.ENGLISH));
} }
catch (Exception e) catch (Exception e)
{ {
try try
{ {
toRemove = ToRemove.valueOf(s.concat("S").toUpperCase(Locale.ENGLISH)); toRemove = ToRemove.valueOf(entityType.concat("S").toUpperCase(Locale.ENGLISH));
} }
catch (Exception ee) catch (Exception ee)
{ {
toRemove = ToRemove.CUSTOM; toRemove = ToRemove.CUSTOM;
customTypes.add(s); customTypes.add(entityType);
} }
} }
types.add(toRemove.toString()); types.add(toRemove.toString());
@ -105,12 +105,33 @@ public class Commandremove extends EssentialsCommand
} }
ArrayList<ToRemove> removeTypes = new ArrayList<ToRemove>(); ArrayList<ToRemove> removeTypes = new ArrayList<ToRemove>();
ArrayList<Mob> customRemoveTypes = new ArrayList<Mob>();
for (String s : types) for (String s : types)
{ {
removeTypes.add(ToRemove.valueOf(s)); removeTypes.add(ToRemove.valueOf(s));
} }
boolean warnUser = false;
for (String s : customTypes)
{
Mob mobType = Mob.fromName(s);
if (mobType == null)
{
warnUser = true;
}
else
{
customRemoveTypes.add(mobType);
}
}
if (warnUser)
{
sender.sendMessage(_("invalidMob"));
}
for (Chunk chunk : world.getLoadedChunks()) for (Chunk chunk : world.getLoadedChunks())
{ {
for (Entity e : chunk.getEntities()) for (Entity e : chunk.getEntities())
@ -242,9 +263,9 @@ public class Commandremove extends EssentialsCommand
} }
break; break;
case CUSTOM: case CUSTOM:
for (String type : customTypes) for (Mob type : customRemoveTypes)
{ {
if (e.getType() == Mob.fromName(type).getType()) if (e.getType() == type.getType())
{ {
e.remove(); e.remove();
removed++; removed++;

2
Essentials/src/messages.properties
View File

@ -171,7 +171,7 @@ invalidCharge=\u00a74Invalid charge.
invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}\u00a76. invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}\u00a76.
invalidHome=\u00a74Home\u00a7c {0} \u00a74doesn''t exist\! invalidHome=\u00a74Home\u00a7c {0} \u00a74doesn''t exist\!
invalidHomeName=\u00a74Invalid home name\! invalidHomeName=\u00a74Invalid home name\!
invalidMob=Invalid mob type. invalidMob=\u00a74Invalid mob type.
invalidNumber=Invalid Number. invalidNumber=Invalid Number.
invalidPotion=\u00a74Invalid Potion. invalidPotion=\u00a74Invalid Potion.
invalidPotionMeta=\u00a74Invalid potion meta\: \u00a7c{0}\u00a74. invalidPotionMeta=\u00a74Invalid potion meta\: \u00a7c{0}\u00a74.

2
Essentials/src/messages_en.properties
View File

@ -171,7 +171,7 @@ invalidCharge=\u00a74Invalid charge.
invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}\u00a76. invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1}\u00a76.
invalidHome=\u00a74Home\u00a7c {0} \u00a74doesn''t exist\! invalidHome=\u00a74Home\u00a7c {0} \u00a74doesn''t exist\!
invalidHomeName=\u00a74Invalid home name\! invalidHomeName=\u00a74Invalid home name\!
invalidMob=Invalid mob type. invalidMob=\u00a74Invalid mob type.
invalidNumber=Invalid Number. invalidNumber=Invalid Number.
invalidPotion=\u00a74Invalid Potion. invalidPotion=\u00a74Invalid Potion.
invalidPotionMeta=\u00a74Invalid potion meta\: \u00a7c{0}\u00a74. invalidPotionMeta=\u00a74Invalid potion meta\: \u00a7c{0}\u00a74.