diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-03-04 08:13:29 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-03-04 08:13:29 +0000 |
commit | b62217f301e920300ce1ba6645a7f464114b5cb7 (patch) | |
tree | c35d009653f1b00d75f4f103b49058c00d85b714 | |
parent | 860f6a41acfb2f2b37c6869ef6bb75e2f5ca2c9b (diff) | |
parent | d9a8453995329a5984cf33a9ec6134dc7ad080cd (diff) | |
download | Essentials-b62217f301e920300ce1ba6645a7f464114b5cb7.tar Essentials-b62217f301e920300ce1ba6645a7f464114b5cb7.tar.gz Essentials-b62217f301e920300ce1ba6645a7f464114b5cb7.tar.lz Essentials-b62217f301e920300ce1ba6645a7f464114b5cb7.tar.xz Essentials-b62217f301e920300ce1ba6645a7f464114b5cb7.zip |
Merge branch 'master' of github.com:essentials/Essentials
-rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 20 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java | 56 |
2 files changed, 29 insertions, 47 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 125962da9..f89f1a5ad 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -262,19 +262,19 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser nickname.append(ess.getSettings().getNicknamePrefix()).append(nick); } - if (addprefixsuffix && ess.getSettings().addPrefixSuffix()) + if (isOp()) { - if (isOp()) + try { - try - { - nickname.insert(0, ess.getSettings().getOperatorColor().toString()); - } - catch (Exception e) - { - } + nickname.insert(0, ess.getSettings().getOperatorColor().toString()); + nickname.append("§f"); } - + catch (Exception e) + { + } + } + if (addprefixsuffix && ess.getSettings().addPrefixSuffix()) + { if (!ess.getSettings().disablePrefix()) { final String prefix = ess.getPermissionsHandler().getPrefix(base).replace('&', '§'); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java index c64d75d2b..5c118eaaa 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java @@ -219,21 +219,16 @@ public class Commandspawnmob extends EssentialsCommand || type == EntityType.VILLAGER || type == EntityType.OCELOT || type == EntityType.WOLF) - && data.equals("baby")) + && data.contains("baby")) { - ((Animals)spawned).setAge(-24000); + ((Animals)spawned).setBaby(); return; } if (type == EntityType.SHEEP) { - if (data.contains("baby")) - { - ((Sheep)spawned).setAge(-24000); - } final String color = data.toUpperCase(Locale.ENGLISH).replace("BABY", ""); try { - if (color.equals("RANDOM")) { Random rand = new Random(); @@ -249,49 +244,36 @@ public class Commandspawnmob extends EssentialsCommand throw new Exception(_("sheepMalformedColor"), e); } } - if (type == EntityType.WOLF - && data.startsWith("tamed")) + if ((type == EntityType.WOLF + || type == EntityType.OCELOT) + && data.contains("tamed")) { - final Wolf wolf = ((Wolf)spawned); - wolf.setTamed(true); - wolf.setOwner(user); - wolf.setSitting(true); - if (data.equals("tamedbaby")) - { - ((Animals)spawned).setAge(-24000); - } + final Tameable tameable = ((Tameable)spawned); + tameable.setTamed(true); + tameable.setOwner(user.getBase()); } if (type == EntityType.WOLF - && data.startsWith("angry")) + && data.contains("angry")) { ((Wolf)spawned).setAngry(true); - if (data.equals("angrybaby")) - { - ((Animals)spawned).setAge(-24000); - } } - if (type == EntityType.CREEPER && data.equals("powered")) + if (type == EntityType.CREEPER && data.contains("powered")) { ((Creeper)spawned).setPowered(true); } if (type == EntityType.OCELOT) { - final Ocelot cat = ((Ocelot)spawned); - if (data.contains("siamese")) { - cat.setCatType(Ocelot.Type.SIAMESE_CAT); - } - if (data.contains("red")) { - cat.setCatType(Ocelot.Type.RED_CAT); - } - if (data.contains("black")) { - cat.setCatType(Ocelot.Type.BLACK_CAT); + if (data.contains("siamese")) + { + ((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT); } - if (data.contains("tamed")) { - cat.setTamed(true); - cat.setOwner(user); + if (data.contains("red")) + { + ((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT); } - if (data.contains("baby")) { - cat.setAge(-24000); + if (data.contains("black")) + { + ((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT); } } } |