From 27e1eae504a7e8f47608d40f0981f610ddc000d4 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 9 Jan 2013 22:11:47 -0500 Subject: [PATCH] braaaaaaains... just kidding, but here are some more zombies --- resources/plugin.yml | 6 +++--- src/com/garbagemule/MobArena/waves/MACreature.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/resources/plugin.yml b/resources/plugin.yml index 61b15af..78f51da 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,8 +1,8 @@ name: MobArena author: garbagemule main: com.garbagemule.MobArena.MobArena -version: 0.94.4.93 -softdepend: [Spout,MultiVerse,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault] +version: 0.94.4.94 +softdepend: [Spout,MultiVerse-Core,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault] commands: ma: description: Base command for MobArena @@ -32,7 +32,7 @@ permissions: description: Arena list command default: true mobarena.use.playerlist: - description: Arena list command + description: Player list command default: true mobarena.admin: diff --git a/src/com/garbagemule/MobArena/waves/MACreature.java b/src/com/garbagemule/MobArena/waves/MACreature.java index ee4ac0a..c1da139 100644 --- a/src/com/garbagemule/MobArena/waves/MACreature.java +++ b/src/com/garbagemule/MobArena/waves/MACreature.java @@ -17,6 +17,7 @@ import org.bukkit.entity.Skeleton; import org.bukkit.entity.Skeleton.SkeletonType; import org.bukkit.entity.Slime; import org.bukkit.entity.Wolf; +import org.bukkit.entity.Zombie; import org.bukkit.inventory.ItemStack; import com.garbagemule.MobArena.MobArena; @@ -81,7 +82,9 @@ public enum MACreature BAT(EntityType.BAT), BATS(EntityType.BAT), WITCH(EntityType.WITCH), WITCHES(EntityType.WITCH), WITHER(EntityType.WITHER), WITHERS(EntityType.WITHER), - WITHERSKELETON(EntityType.SKELETON), WITHERSKELETONS(EntityType.SKELETON); + WITHERSKELETON(EntityType.SKELETON), WITHERSKELETONS(EntityType.SKELETON), + BABYZOMBIE(EntityType.ZOMBIE), BABYZOMBIES(EntityType.ZOMBIE), + ZOMBIEVILLAGER(EntityType.ZOMBIE), ZOMBIEVILLAGERS(EntityType.ZOMBIE); private List colors = Arrays.asList(DyeColor.values()); private EntityType type; @@ -153,6 +156,13 @@ public enum MACreature case ZOMBIEPIGMEN: ((PigZombie) e).getEquipment().setItemInHand(new ItemStack(Material.GOLD_SWORD, 1)); break; + case ZOMBIEVILLAGER: + case ZOMBIEVILLAGERS: + ((Zombie) e).setVillager(true); + break; + case BABYZOMBIE: + case BABYZOMBIES: + ((Zombie) e).setBaby(true); case WITHERSKELETON: case WITHERSKELETONS: ((Skeleton) e).getEquipment().setItemInHand(new ItemStack(Material.STONE_SWORD, 1));