summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-03-29 23:18:48 +0200
committerErik Broes <erikbroes@grum.nl>2011-03-29 23:18:48 +0200
commitc69eac3f3ae4da56bdffa3e3fbfc819746f05abe (patch)
tree154fd443112e2e01b24d73ac2698084d2b797776 /src/main/java/org
parentec74fe8e375816ac4a7efd75fc96b485e329cd9f (diff)
downloadcraftbukkit-c69eac3f3ae4da56bdffa3e3fbfc819746f05abe.tar
craftbukkit-c69eac3f3ae4da56bdffa3e3fbfc819746f05abe.tar.gz
craftbukkit-c69eac3f3ae4da56bdffa3e3fbfc819746f05abe.tar.lz
craftbukkit-c69eac3f3ae4da56bdffa3e3fbfc819746f05abe.tar.xz
craftbukkit-c69eac3f3ae4da56bdffa3e3fbfc819746f05abe.zip
Add MONSTER to CreatureSpawnEvent
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 5e8bcc28..73b3a959 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -8,6 +8,7 @@ import net.minecraft.server.EntityGhast;
import net.minecraft.server.EntityGiantZombie;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityLiving;
+import net.minecraft.server.EntityMonster;
import net.minecraft.server.EntityPig;
import net.minecraft.server.EntityPigZombie;
import net.minecraft.server.EntitySheep;
@@ -199,6 +200,8 @@ public class CraftEventFactory {
type = CreatureType.GHAST;
} else if (entityliving instanceof EntityGiantZombie) {
type = CreatureType.GIANT;
+ } else if (entityliving instanceof EntityMonster) {
+ type = CreatureType.MONSTER;
} else if (entityliving instanceof EntityPig) {
type = CreatureType.PIG;
} else if (entityliving instanceof EntityPigZombie) {
@@ -207,14 +210,14 @@ public class CraftEventFactory {
type = CreatureType.SHEEP;
} else if (entityliving instanceof EntitySkeleton) {
type = CreatureType.SKELETON;
- } else if (entityliving instanceof EntitySpider) {
- type = CreatureType.SPIDER;
- } else if (entityliving instanceof EntityZombie) {
- type = CreatureType.ZOMBIE;
} else if (entityliving instanceof EntitySlime) {
type = CreatureType.SLIME;
+ } else if (entityliving instanceof EntitySpider) {
+ type = CreatureType.SPIDER;
} else if (entityliving instanceof EntitySquid) {
type = CreatureType.SQUID;
+ } else if (entityliving instanceof EntityZombie) {
+ type = CreatureType.ZOMBIE;
}
CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation());