diff --git a/MobArena.jar b/MobArena.jar index d16e805..407cbdd 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/resources/plugin.yml b/resources/plugin.yml index 606f03d..ff147fb 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,7 +1,7 @@ name: MobArena author: garbagemule main: com.garbagemule.MobArena.MobArena -version: 0.94.4.59 +version: 0.94.4.60 softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault] commands: ma: diff --git a/src/com/garbagemule/MobArena/waves/MACreature.java b/src/com/garbagemule/MobArena/waves/MACreature.java index 3b77129..e9507bd 100644 --- a/src/com/garbagemule/MobArena/waves/MACreature.java +++ b/src/com/garbagemule/MobArena/waves/MACreature.java @@ -1,11 +1,16 @@ package com.garbagemule.MobArena.waves; +import java.util.Arrays; +import java.util.List; + +import org.bukkit.DyeColor; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Creature; import org.bukkit.entity.EntityType; import org.bukkit.entity.Creeper; import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Sheep; import org.bukkit.entity.Slime; import org.bukkit.entity.Wolf; @@ -62,6 +67,7 @@ public enum MACreature MAGMACUBEBIG(EntityType.MAGMA_CUBE), MAGMACUBESBIG(EntityType.MAGMA_CUBE), MAGMACUBEHUGE(EntityType.MAGMA_CUBE), MAGMACUBESHUGE(EntityType.MAGMA_CUBE); + private List colors = Arrays.asList(DyeColor.values()); private EntityType type; private MACreature(EntityType type) { @@ -79,10 +85,13 @@ public enum MACreature public LivingEntity spawn(Arena arena, World world, Location loc) { LivingEntity e = world.spawnCreature(loc, type); - switch (this) - { + switch (this) { + case SHEEP: + ((Sheep) e).setColor(colors.get(MobArena.random.nextInt(colors.size()))); + break; case EXPLODINGSHEEP: arena.getMonsterManager().addExplodingSheep(e); + ((Sheep) e).setColor(DyeColor.RED); break; case POWEREDCREEPERS: ((Creeper) e).setPowered(true);