diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-12-22 00:12:22 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-12-22 00:12:22 +0000 |
| commit | 3017d2a7f479ffa8dd75927caee764afecb124e0 (patch) | |
| tree | f618a0c10f391f96ae0533a572a0cbb3ec9290dc | |
| parent | 23d2ffb134fb7f109ff6e2a17bc9268eb457a29f (diff) | |
| download | Essentials-3017d2a7f479ffa8dd75927caee764afecb124e0.tar Essentials-3017d2a7f479ffa8dd75927caee764afecb124e0.tar.gz Essentials-3017d2a7f479ffa8dd75927caee764afecb124e0.tar.lz Essentials-3017d2a7f479ffa8dd75927caee764afecb124e0.tar.xz Essentials-3017d2a7f479ffa8dd75927caee764afecb124e0.zip | |
Better matching of zombie and skeleton mobdata to avoid confusion.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/SpawnMob.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Essentials/src/com/earth2me/essentials/SpawnMob.java b/Essentials/src/com/earth2me/essentials/SpawnMob.java index 7a8d1646f..cfd0c5cec 100644 --- a/Essentials/src/com/earth2me/essentials/SpawnMob.java +++ b/Essentials/src/com/earth2me/essentials/SpawnMob.java @@ -217,20 +217,16 @@ public class SpawnMob sender.sendMessage(_("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned)))); } - MobData newData = MobData.fromData(spawned, data); - while (newData != null) - { - newData.setData(spawned, target.getBase(), data); - data = data.replace(newData.getMatched(), ""); - newData = MobData.fromData(spawned, data); - } - if (spawned instanceof Zombie || type == EntityType.SKELETON) { if (inputData.contains("armor") || inputData.contains("armour")) { final EntityEquipment invent = ((LivingEntity)spawned).getEquipment(); - if (inputData.contains("diamond")) + if (inputData.contains("noarmor") || inputData.contains("noarmour")) + { + invent.clear(); + } + else if (inputData.contains("diamond")) { invent.setBoots(new ItemStack(Material.DIAMOND_BOOTS, 1)); invent.setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS, 1)); @@ -251,10 +247,6 @@ public class SpawnMob invent.setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE, 1)); invent.setHelmet(new ItemStack(Material.LEATHER_HELMET, 1)); } - else if (inputData.contains("no")) - { - invent.clear(); - } else { invent.setBoots(new ItemStack(Material.IRON_BOOTS, 1)); @@ -269,6 +261,14 @@ public class SpawnMob } } + + MobData newData = MobData.fromData(spawned, data); + while (newData != null) + { + newData.setData(spawned, target.getBase(), data); + data = data.replace(newData.getMatched(), ""); + newData = MobData.fromData(spawned, data); + } } private static void defaultMobData(final EntityType type, final Entity spawned) |