summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 73b3a959..e58fae0e 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -200,8 +200,6 @@ 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) {
@@ -218,6 +216,9 @@ public class CraftEventFactory {
type = CreatureType.SQUID;
} else if (entityliving instanceof EntityZombie) {
type = CreatureType.ZOMBIE;
+ // Supertype of many, last!
+ } else if (entityliving instanceof EntityMonster) {
+ type = CreatureType.MONSTER;
}
CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation());