diff options
author | EvilSeph <evilseph@gmail.com> | 2012-03-10 16:31:21 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-03-10 16:31:21 -0500 |
commit | ae6b3711ea3e9608158aba9c293b7df4219d1205 (patch) | |
tree | e9543822af81cfcc0db74dc6ad487c454e5888d0 /src/main/java/net/minecraft/server/World.java | |
parent | f5348635522112c32793ebc2391985bf7031e8e0 (diff) | |
download | craftbukkit-ae6b3711ea3e9608158aba9c293b7df4219d1205.tar craftbukkit-ae6b3711ea3e9608158aba9c293b7df4219d1205.tar.gz craftbukkit-ae6b3711ea3e9608158aba9c293b7df4219d1205.tar.lz craftbukkit-ae6b3711ea3e9608158aba9c293b7df4219d1205.tar.xz craftbukkit-ae6b3711ea3e9608158aba9c293b7df4219d1205.zip |
Made zombie invasions respect spawn-monsters setting. Fixes BUKKIT-1123
Diffstat (limited to 'src/main/java/net/minecraft/server/World.java')
-rw-r--r-- | src/main/java/net/minecraft/server/World.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 75baeacd..b57fe3ed 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -883,7 +883,7 @@ public class World implements IBlockAccess { boolean isAnimal = entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal; boolean isMonster = entity instanceof EntityMonster || entity instanceof EntityGhast || entity instanceof EntitySlime; - if (spawnReason == SpawnReason.NATURAL || spawnReason == SpawnReason.CHUNK_GEN || spawnReason == SpawnReason.JOCKEY || spawnReason == SpawnReason.SPAWNER || spawnReason == SpawnReason.BED || spawnReason == SpawnReason.EGG) { + if (spawnReason == SpawnReason.NATURAL || spawnReason == SpawnReason.CHUNK_GEN || spawnReason == SpawnReason.JOCKEY || spawnReason == SpawnReason.SPAWNER || spawnReason == SpawnReason.BED || spawnReason == SpawnReason.EGG || spawnReason == SpawnReason.VILLAGE_INVASION) { if (isAnimal && !allowAnimals || isMonster && !allowMonsters) return false; } |