Made zombie invasions respect spawn-monsters setting. Fixes BUKKIT-1123

This commit is contained in:
EvilSeph 2012-03-10 16:31:21 -05:00
parent f534863552
commit ae6b3711ea

View File

@ -883,7 +883,7 @@ public class World implements IBlockAccess {
boolean isAnimal = entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal; boolean isAnimal = entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal;
boolean isMonster = entity instanceof EntityMonster || entity instanceof EntityGhast || entity instanceof EntitySlime; 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; if (isAnimal && !allowAnimals || isMonster && !allowMonsters) return false;
} }