From 6eae39ef9e948ea60c2d6c4f0912822b6f43300b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 14 Apr 2016 17:48:56 -0500 Subject: [PATCH] Water mobs should only spawn in the water diff --git a/src/main/java/net/minecraft/server/EntityWaterAnimal.java b/src/main/java/net/minecraft/server/EntityWaterAnimal.java index 90d33af95..251555713 100644 --- a/src/main/java/net/minecraft/server/EntityWaterAnimal.java +++ b/src/main/java/net/minecraft/server/EntityWaterAnimal.java @@ -11,7 +11,15 @@ public abstract class EntityWaterAnimal extends EntityInsentient implements IAni } public boolean cM() { - return true; + // Paper start - Don't let water mobs spawn in non-water blocks + // Based around EntityAnimal's implementation + int i = MathHelper.floor(this.locX); + int j = MathHelper.floor(this.getBoundingBox().b); // minY of bounding box + int k = MathHelper.floor(this.locZ); + Block block = this.world.getType(new BlockPosition(i, j, k)).getBlock(); + + return block == Blocks.WATER || block == Blocks.FLOWING_WATER; + // Paper end } public boolean canSpawn() { -- 2.12.0.windows.1