TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup of /spawnmob

Browse source
This commit is contained in:
snowleo 2012-03-03 17:01:53 +01:00
parent cea5c81d44
commit e6181928e8
1 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
View file

@ -219,21 +219,16 @@ public class Commandspawnmob extends EssentialsCommand
|| type == EntityType.VILLAGER || type == EntityType.VILLAGER
|| type == EntityType.OCELOT || type == EntityType.OCELOT
|| type == EntityType.WOLF) || type == EntityType.WOLF)
&& data.equals("baby")) && data.contains("baby"))
{ {
((Animals)spawned).setAge(-24000); ((Animals)spawned).setBaby();
return; return;
} }
if (type == EntityType.SHEEP) if (type == EntityType.SHEEP)
{ {
if (data.contains("baby"))
{
((Sheep)spawned).setAge(-24000);
}
final String color = data.toUpperCase(Locale.ENGLISH).replace("BABY", ""); final String color = data.toUpperCase(Locale.ENGLISH).replace("BABY", "");
try try
{ {
if (color.equals("RANDOM")) if (color.equals("RANDOM"))
{ {
Random rand = new Random(); Random rand = new Random();
@ -249,49 +244,36 @@ public class Commandspawnmob extends EssentialsCommand
throw new Exception(_("sheepMalformedColor"), e); throw new Exception(_("sheepMalformedColor"), e);
} }
} }
if (type == EntityType.WOLF if ((type == EntityType.WOLF
&& data.startsWith("tamed")) || type == EntityType.OCELOT)
&& data.contains("tamed"))
{ {
final Wolf wolf = ((Wolf)spawned); final Tameable tameable = ((Tameable)spawned);
wolf.setTamed(true); tameable.setTamed(true);
wolf.setOwner(user); tameable.setOwner(user.getBase());
wolf.setSitting(true);
if (data.equals("tamedbaby"))
{
((Animals)spawned).setAge(-24000);
}
} }
if (type == EntityType.WOLF if (type == EntityType.WOLF
&& data.startsWith("angry")) && data.contains("angry"))
{ {
((Wolf)spawned).setAngry(true); ((Wolf)spawned).setAngry(true);
if (data.equals("angrybaby"))
{
((Animals)spawned).setAge(-24000);
} }
} if (type == EntityType.CREEPER && data.contains("powered"))
if (type == EntityType.CREEPER && data.equals("powered"))
{ {
((Creeper)spawned).setPowered(true); ((Creeper)spawned).setPowered(true);
} }
if (type == EntityType.OCELOT) if (type == EntityType.OCELOT)
{ {
final Ocelot cat = ((Ocelot)spawned); if (data.contains("siamese"))
if (data.contains("siamese")) { {
cat.setCatType(Ocelot.Type.SIAMESE_CAT); ((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
} }
if (data.contains("red")) { if (data.contains("red"))
cat.setCatType(Ocelot.Type.RED_CAT); {
((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
} }
if (data.contains("black")) { if (data.contains("black"))
cat.setCatType(Ocelot.Type.BLACK_CAT); {
} ((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
if (data.contains("tamed")) {
cat.setTamed(true);
cat.setOwner(user);
}
if (data.contains("baby")) {
cat.setAge(-24000);
} }
} }
} }