From 15bd41fefcb35b11427c04fe3229e35ef585117b Mon Sep 17 00:00:00 2001 From: drtshock Date: Thu, 16 Apr 2015 08:52:29 -0500 Subject: [PATCH] Add new mobs. Update child to 1.8.3 --- Essentials/pom.xml | 8 +++----- Essentials/src/com/earth2me/essentials/Mob.java | 7 ++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 10aab3432..aade61eeb 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -54,11 +54,9 @@ - org.bukkit - bukkit - 1.7.2-R0.3-SNAPSHOT - system - ${project.basedir}/../lib/bukkit.jar + org.spigotmc + spigot-api + 1.8.3-R0.1-SNAPSHOT BOSEconomy diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java index 67edcf344..fb2b2c587 100644 --- a/Essentials/src/com/earth2me/essentials/Mob.java +++ b/Essentials/src/com/earth2me/essentials/Mob.java @@ -53,7 +53,12 @@ public enum Mob { MINECART_HOPPER("HopperMinecart", Enemies.NEUTRAL, EntityType.MINECART_HOPPER), MINECART_MOB_SPAWNER("SpawnerMinecart", Enemies.NEUTRAL, EntityType.MINECART_MOB_SPAWNER), ENDERCRYSTAL("EnderCrystal", Enemies.NEUTRAL, EntityType.ENDER_CRYSTAL), - EXPERIENCEORB("ExperienceOrb", Enemies.NEUTRAL, EntityType.EXPERIENCE_ORB); + EXPERIENCEORB("ExperienceOrb", Enemies.NEUTRAL, EntityType.EXPERIENCE_ORB), + ARMOR_STAND("ArmorStand", Enemies.NEUTRAL, EntityType.ARMOR_STAND), + ENDERMITE("Endermite", Enemies.ENEMY, EntityType.ENDERMITE), + GUARDIAN("Guradian", Enemies.ENEMY, EntityType.GUARDIAN), + RABBIT("Rabbit", Enemies.FRIENDLY, EntityType.RABBIT); + public static final Logger logger = Logger.getLogger("Essentials"); private Mob(String n, Enemies en, String s, EntityType type) {