2016-04-15 00:49:11 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
|
|
|
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
|
2017-06-19 03:36:55 +02:00
|
|
|
index f430bdee..0597edad 100644
|
2016-04-15 00:49:11 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityWaterAnimal.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityWaterAnimal.java
|
|
|
|
@@ -0,0 +0,0 @@ public abstract class EntityWaterAnimal extends EntityInsentient implements IAni
|
|
|
|
}
|
|
|
|
|
2017-05-14 20:05:01 +02:00
|
|
|
public boolean P() {
|
2016-04-15 00:49:11 +02:00
|
|
|
- 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);
|
2016-04-15 22:49:39 +02:00
|
|
|
+ Block block = this.world.getType(new BlockPosition(i, j, k)).getBlock();
|
2016-04-15 00:49:11 +02:00
|
|
|
+
|
2016-04-15 22:49:39 +02:00
|
|
|
+ return block == Blocks.WATER || block == Blocks.FLOWING_WATER;
|
2016-04-15 00:49:11 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean canSpawn() {
|
|
|
|
--
|