Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-12-25 18:48:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #149 from acstache/bleeding

Browse Source 
braaaaaaains... just kidding, but here are some more zombies
This commit is contained in:
garbagemule 2013-01-11 18:29:50 -08:00
commit a6ea9d03da
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/plugin.yml
View File

@ -1,8 +1,8 @@
name: MobArena name: MobArena
author: garbagemule author: garbagemule
main: com.garbagemule.MobArena.MobArena main: com.garbagemule.MobArena.MobArena
version: 0.94.4.93 version: 0.94.4.94
softdepend: [Spout,MultiVerse,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault] softdepend: [Spout,MultiVerse-Core,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault]
commands: commands:
ma: ma:
description: Base command for MobArena description: Base command for MobArena
@ -32,7 +32,7 @@ permissions:
description: Arena list command description: Arena list command
default: true default: true
mobarena.use.playerlist: mobarena.use.playerlist:
description: Arena list command description: Player list command
default: true default: true
mobarena.admin: mobarena.admin:

12
src/com/garbagemule/MobArena/waves/MACreature.java
View File

@ -17,6 +17,7 @@ import org.bukkit.entity.Skeleton;
import org.bukkit.entity.Skeleton.SkeletonType; import org.bukkit.entity.Skeleton.SkeletonType;
import org.bukkit.entity.Slime; import org.bukkit.entity.Slime;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.entity.Zombie;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import com.garbagemule.MobArena.MobArena; import com.garbagemule.MobArena.MobArena;
@ -81,7 +82,9 @@ public enum MACreature
BAT(EntityType.BAT), BATS(EntityType.BAT), BAT(EntityType.BAT), BATS(EntityType.BAT),
WITCH(EntityType.WITCH), WITCHES(EntityType.WITCH), WITCH(EntityType.WITCH), WITCHES(EntityType.WITCH),
WITHER(EntityType.WITHER), WITHERS(EntityType.WITHER), 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<DyeColor> colors = Arrays.asList(DyeColor.values()); private List<DyeColor> colors = Arrays.asList(DyeColor.values());
private EntityType type; private EntityType type;
@ -153,6 +156,13 @@ public enum MACreature
case ZOMBIEPIGMEN: case ZOMBIEPIGMEN:
((PigZombie) e).getEquipment().setItemInHand(new ItemStack(Material.GOLD_SWORD, 1)); ((PigZombie) e).getEquipment().setItemInHand(new ItemStack(Material.GOLD_SWORD, 1));
break; break;
case ZOMBIEVILLAGER:
case ZOMBIEVILLAGERS:
((Zombie) e).setVillager(true);
break;
case BABYZOMBIE:
case BABYZOMBIES:
((Zombie) e).setBaby(true);
case WITHERSKELETON: case WITHERSKELETON:
case WITHERSKELETONS: case WITHERSKELETONS:
((Skeleton) e).getEquipment().setItemInHand(new ItemStack(Material.STONE_SWORD, 1)); ((Skeleton) e).getEquipment().setItemInHand(new ItemStack(Material.STONE_SWORD, 1));