diff options
author | EvilSeph <evilseph@gmail.com> | 2011-09-19 22:53:36 -0400 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2011-09-20 01:20:05 -0400 |
commit | 167febd8e69d3e53f584f0a3d39e02dec2353bc5 (patch) | |
tree | b86b217572af2888712960fcec558fb5768da59e /src/main/java/net/minecraft/server/EntityEgg.java | |
parent | d01a3acd827201aad5be65a557725ab6ce465221 (diff) | |
download | craftbukkit-167febd8e69d3e53f584f0a3d39e02dec2353bc5.tar craftbukkit-167febd8e69d3e53f584f0a3d39e02dec2353bc5.tar.gz craftbukkit-167febd8e69d3e53f584f0a3d39e02dec2353bc5.tar.lz craftbukkit-167febd8e69d3e53f584f0a3d39e02dec2353bc5.tar.xz craftbukkit-167febd8e69d3e53f584f0a3d39e02dec2353bc5.zip |
Fixed allow-animals not applying to chunk generation.
Moved the legitimacy checking into World.addEntity for better organisation and to better account for future methods being added that control whether or not an entity should spawn.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEgg.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityEgg.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java index 3cf3c43e..5459af4d 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -249,12 +249,8 @@ public class EntityEgg extends Entity { break; } - // The world we're spawning in accepts this creature - boolean isAnimal = entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal; - if ((isAnimal && this.world.allowAnimals) || (!isAnimal && this.world.allowMonsters)) { - entity.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); - this.world.addEntity(entity, SpawnReason.EGG); - } + entity.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); + this.world.addEntity(entity, SpawnReason.EGG); // CraftBukkit end } } |