diff --git a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch index d7d391fad9..6c479a7a90 100644 --- a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From 3b1555dec9a5b796fc8016f338ffcf0e06c8c38b Mon Sep 17 00:00:00 2001 +From f51ba416eefd643136f51b6a65ce5baf51447bbe Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 361cc6a92e..2bc0368d04 100644 +index 361cc6a92e..5a237fa1dd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -48,6 +48,15 @@ index 361cc6a92e..2bc0368d04 100644 this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate); } // CraftBukkit end +@@ -539,7 +539,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { + public IBlockData getType(BlockPosition blockposition) { + // CraftBukkit start - tree generation + if (captureTreeGeneration) { +- CapturedBlockState previous = capturedBlockStates.get(blockposition); ++ CraftBlockState previous = capturedBlockStates.get(blockposition); // Paper + if (previous != null) { + return previous.getHandle(); + } -- 2.25.0