From dda4d3c93c31b048d8acdb32d24f03c9e598b565 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 14 Mar 2012 16:49:53 -0700 Subject: [PATCH] Proper fix for SDK's invalid bit shifts of parameters for chunk population --- .../minecraft/src/ChunkProviderServer.java.patch | 9 +++++++++ .../net/minecraft/src/ModLoader.java.patch | 14 -------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/forge/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch index f5a864c61..505506e19 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch @@ -21,3 +21,12 @@ if (this.world.worldProvider.canRespawnHere()) { ChunkCoordinates var3 = this.world.getSpawnPoint(); +@@ -200,7 +207,7 @@ + if (this.serverChunkGenerator != null) + { + this.serverChunkGenerator.populate(par1IChunkProvider, par2, par3); +- ModLoader.populateChunk(this.serverChunkGenerator, par2 << 4, par3 << 4, this.world); ++ ModLoader.populateChunk(this.serverChunkGenerator, par2, par3, this.world); + var4.setChunkModified(); + } + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ModLoader.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ModLoader.java.patch index b466a1062..d5e35ddc5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ModLoader.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ModLoader.java.patch @@ -105,20 +105,6 @@ Iterator var3 = inGameHooks.entrySet().iterator(); while (var3.hasNext()) -@@ -863,11 +889,11 @@ - - if (var0 instanceof ChunkProviderGenerate) - { -- var10.generateSurface(var3, var4, var1 << 4, var2 << 4); -+ var10.generateSurface(var3, var4, var1, var2); - } - else if (var0 instanceof ChunkProviderHell) - { -- var10.generateNether(var3, var4, var1 << 4, var2 << 4); -+ var10.generateNether(var3, var4, var1, var2); - } - } - } @@ -1111,6 +1137,12 @@ } }