Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 10:20:53 +01:00
Code Issues Projects Releases Wiki Activity

CreatureSpawnEvent: Fix forgotten inheritance with CreatureType

Browse Source
This commit is contained in:
Erik Broes 2011-03-30 08:51:42 +02:00
parent e9cc4bbb05
commit 0635f7c1b8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -200,8 +200,6 @@ public class CraftEventFactory {
type = CreatureType.GHAST; type = CreatureType.GHAST;
} else if (entityliving instanceof EntityGiantZombie) { } else if (entityliving instanceof EntityGiantZombie) {
type = CreatureType.GIANT; type = CreatureType.GIANT;
} else if (entityliving instanceof EntityMonster) {
type = CreatureType.MONSTER;
} else if (entityliving instanceof EntityPig) { } else if (entityliving instanceof EntityPig) {
type = CreatureType.PIG; type = CreatureType.PIG;
} else if (entityliving instanceof EntityPigZombie) { } else if (entityliving instanceof EntityPigZombie) {
@ -218,6 +216,9 @@ public class CraftEventFactory {
type = CreatureType.SQUID; type = CreatureType.SQUID;
} else if (entityliving instanceof EntityZombie) { } else if (entityliving instanceof EntityZombie) {
type = CreatureType.ZOMBIE; type = CreatureType.ZOMBIE;
// Supertype of many, last!
} else if (entityliving instanceof EntityMonster) {
type = CreatureType.MONSTER;
} }
CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation()); CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation());