diff --git a/forge/fml-src-2.2.48.135.zip b/forge/fml-src-2.2.64.141.zip similarity index 79% rename from forge/fml-src-2.2.48.135.zip rename to forge/fml-src-2.2.64.141.zip index 561d117c13..c520f8048e 100644 Binary files a/forge/fml-src-2.2.48.135.zip and b/forge/fml-src-2.2.64.141.zip differ diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index 4791bdb87a..81e3ebcc20 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -320,7 +320,7 @@ } @@ -4449,4 +4463,39 @@ { - return this.worldInfo.getTerrainType() == WorldType.FLAT ? 0.0D : 63.0D; + return this.worldInfo.getTerrainType().getHorizon(this); } + + diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch index 27351a6512..25ab2d9624 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch @@ -8,7 +8,7 @@ public abstract class WorldProvider { /** world object being used */ -@@ -124,7 +126,7 @@ +@@ -117,7 +119,7 @@ public static WorldProvider getProviderForDimension(int par0) { @@ -17,9 +17,9 @@ } /** -@@ -139,4 +141,36 @@ +@@ -132,4 +134,36 @@ { - return this.terrainType == WorldType.FLAT ? 4 : 64; + return this.terrainType.getMinimumSpawnHeight(worldObj); } + + /**