Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-27 04:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Add horse variants as monster types.

Browse Source
This commit is contained in:
garbagemule 2013-10-07 11:55:50 +02:00
parent 56a616ee76
commit bf30185534
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/plugin.yml
View File

@ -1,7 +1,7 @@
name: MobArena name: MobArena
author: garbagemule author: garbagemule
main: com.garbagemule.MobArena.MobArena main: com.garbagemule.MobArena.MobArena
version: 0.95.5.36 version: 0.95.5.37
softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault] softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault]
commands: commands:
ma: ma:

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

@ -7,17 +7,8 @@ import org.bukkit.DyeColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Creature; import org.bukkit.entity.*;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.PigZombie;
import org.bukkit.entity.Sheep;
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.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;
@ -86,8 +77,15 @@ public enum MACreature
BABYZOMBIE(EntityType.ZOMBIE), BABYZOMBIES(EntityType.ZOMBIE), BABYZOMBIE(EntityType.ZOMBIE), BABYZOMBIES(EntityType.ZOMBIE),
BABYPIGMAN(EntityType.PIG_ZOMBIE), BABYPIGMEN(EntityType.PIG_ZOMBIE), BABYPIGMAN(EntityType.PIG_ZOMBIE), BABYPIGMEN(EntityType.PIG_ZOMBIE),
ZOMBIEVILLAGER(EntityType.ZOMBIE), ZOMBIEVILLAGERS(EntityType.ZOMBIE), ZOMBIEVILLAGER(EntityType.ZOMBIE), ZOMBIEVILLAGERS(EntityType.ZOMBIE),
BABYZOMBIEVILLAGER(EntityType.ZOMBIE),BABYZOMBIEVILLAGERS(EntityType.ZOMBIE); BABYZOMBIEVILLAGER(EntityType.ZOMBIE),BABYZOMBIEVILLAGERS(EntityType.ZOMBIE),
// 1.6 creatures
HORSE(EntityType.HORSE), HORSES(EntityType.HORSE),
DONKEY(EntityType.HORSE), DONKEYS(EntityType.HORSE),
MULE(EntityType.HORSE), MULES(EntityType.HORSE),
SKELETONHORSE(EntityType.HORSE), SKELETONHORSES(EntityType.HORSE),
UNDEADHORSE(EntityType.HORSE), UNDEADHORSES(EntityType.HORSE);
private List<DyeColor> colors = Arrays.asList(DyeColor.values()); private List<DyeColor> colors = Arrays.asList(DyeColor.values());
private EntityType type; private EntityType type;
@ -176,6 +174,26 @@ public enum MACreature
((Skeleton) e).getEquipment().setItemInHand(new ItemStack(Material.STONE_SWORD, 1)); ((Skeleton) e).getEquipment().setItemInHand(new ItemStack(Material.STONE_SWORD, 1));
((Skeleton) e).setSkeletonType(SkeletonType.WITHER); ((Skeleton) e).setSkeletonType(SkeletonType.WITHER);
break; break;
case HORSE:
case HORSES:
((Horse) e).setVariant(Horse.Variant.HORSE);
break;
case DONKEY:
case DONKEYS:
((Horse) e).setVariant(Horse.Variant.DONKEY);
break;
case MULE:
case MULES:
((Horse) e).setVariant(Horse.Variant.MULE);
break;
case SKELETONHORSE:
case SKELETONHORSES:
((Horse) e).setVariant(Horse.Variant.SKELETON_HORSE);
break;
case UNDEADHORSE:
case UNDEADHORSES:
((Horse) e).setVariant(Horse.Variant.UNDEAD_HORSE);
break;
default: default:
break; break;
} }