diff --git a/patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch b/patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch index cca19b182..39367f499 100644 --- a/patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch +++ b/patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch @@ -1,11 +1,11 @@ -From 801c2e3e493953a5d51b37d5fb7ff0813884b383 Mon Sep 17 00:00:00 2001 +From c216c73efbb003aeb654a726e151c909983c5398 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 06:15:25 -0500 Subject: [PATCH] Fix mis-mapped getHeight methods for World and IBlockAccess --- src/main/java/net/minecraft/server/BlockPiston.java | 2 +- - src/main/java/net/minecraft/server/ChunkConverter.java | 2 +- + src/main/java/net/minecraft/server/ChunkConverter.java | 4 ++-- src/main/java/net/minecraft/server/IBlockAccess.java | 2 +- src/main/java/net/minecraft/server/ItemScaffolding.java | 2 +- src/main/java/net/minecraft/server/Navigation.java | 4 ++-- @@ -14,7 +14,7 @@ Subject: [PATCH] Fix mis-mapped getHeight methods for World and IBlockAccess src/main/java/net/minecraft/server/TileEntityConduit.java | 2 +- src/main/java/net/minecraft/server/World.java | 2 +- src/main/java/net/minecraft/server/WorldServer.java | 2 +- - 10 files changed, 11 insertions(+), 11 deletions(-) + 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java index a5573f21f..5000a1243 100644 @@ -30,7 +30,7 @@ index a5573f21f..5000a1243 100644 if (iblockdata.f(world, blockposition) == -1.0F) { return false; diff --git a/src/main/java/net/minecraft/server/ChunkConverter.java b/src/main/java/net/minecraft/server/ChunkConverter.java -index 9781b092e..8fb52a72e 100644 +index 9781b092e..0e4116f09 100644 --- a/src/main/java/net/minecraft/server/ChunkConverter.java +++ b/src/main/java/net/minecraft/server/ChunkConverter.java @@ -94,7 +94,7 @@ public class ChunkConverter { @@ -42,6 +42,15 @@ index 9781b092e..8fb52a72e 100644 while (iterator.hasNext()) { BlockPosition blockposition = (BlockPosition) iterator.next(); +@@ -343,7 +343,7 @@ public class ChunkConverter { + if ((Integer) iblockdata.get(BlockProperties.ah) >= j) { + generatoraccess.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockProperties.ah, j), 18); + if (i != 7) { +- EnumDirection[] aenumdirection = null.f; ++ EnumDirection[] aenumdirection = f; // Purpur - decompile error + int k = aenumdirection.length; + + for (int l = 0; l < k; ++l) { diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java index c44edda65..1f0fd6869 100644 --- a/src/main/java/net/minecraft/server/IBlockAccess.java