diff options
author | EvilSeph <evilseph@gmail.com> | 2012-03-10 16:56:21 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-03-10 16:56:21 -0500 |
commit | 5c757df673fa0baf0eca32ec69f6386e27815c93 (patch) | |
tree | 49f44d5b09948013f419418c4fea6a6f80594d38 /src/main | |
parent | ae6b3711ea3e9608158aba9c293b7df4219d1205 (diff) | |
download | craftbukkit-5c757df673fa0baf0eca32ec69f6386e27815c93.tar craftbukkit-5c757df673fa0baf0eca32ec69f6386e27815c93.tar.gz craftbukkit-5c757df673fa0baf0eca32ec69f6386e27815c93.tar.lz craftbukkit-5c757df673fa0baf0eca32ec69f6386e27815c93.tar.xz craftbukkit-5c757df673fa0baf0eca32ec69f6386e27815c93.zip |
Made iron golems spawning to defend villagers respect spawn-animals. Fixes BUKKIT-1124
Diffstat (limited to 'src/main')
-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 b57fe3ed..8a7be687 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 || spawnReason == SpawnReason.VILLAGE_INVASION) { + if (spawnReason == SpawnReason.NATURAL || spawnReason == SpawnReason.CHUNK_GEN || spawnReason == SpawnReason.JOCKEY || spawnReason == SpawnReason.SPAWNER || spawnReason == SpawnReason.BED || spawnReason == SpawnReason.EGG || spawnReason == SpawnReason.VILLAGE_INVASION || spawnReason == SpawnReason.VILLAGE_DEFENSE) { if (isAnimal && !allowAnimals || isMonster && !allowMonsters) return false; } |