mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
Water mobs should only spawn in the water
Closes GH-199
This commit is contained in:
parent
271e7c5cb4
commit
9f0a7201a1
2 changed files with 29 additions and 0 deletions
|
@ -0,0 +1,28 @@
|
||||||
|
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
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- 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
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean cF() {
|
||||||
|
- 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 below = this.world.getType(new BlockPosition(i, j, k).down()).getBlock();
|
||||||
|
+
|
||||||
|
+ return below == Blocks.WATER || below == Blocks.FLOWING_WATER;
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean canSpawn() {
|
||||||
|
--
|
|
@ -51,6 +51,7 @@ import DataBits
|
||||||
import DataConverterMaterialId
|
import DataConverterMaterialId
|
||||||
import EULA
|
import EULA
|
||||||
import EntitySquid
|
import EntitySquid
|
||||||
|
import EntityWaterAnimal
|
||||||
import FileIOThread
|
import FileIOThread
|
||||||
import ItemBlock
|
import ItemBlock
|
||||||
import PacketPlayInResourcePackStatus
|
import PacketPlayInResourcePackStatus
|
||||||
|
|
Loading…
Reference in a new issue