e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
From 348184180d29734db3274dd6de280a3f9faaf6a7 Mon Sep 17 00:00:00 2001
|
|
From: Trigary <trigary0@gmail.com>
|
|
Date: Mon, 17 Feb 2020 22:53:33 +0100
|
|
Subject: [PATCH] fix blockstate capture undoing
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index bb34486a36..5117dafbcf 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -353,7 +353,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
|
Block block = iblockdata.getBlock();
|
|
|
|
// CraftBukkit start - capture blockstates
|
|
+ boolean capturedBlockState = false; //Paper - fix blockstate capture undoing
|
|
if (this.captureBlockStates && !this.capturedBlockStates.containsKey(blockposition)) {
|
|
+ capturedBlockState = true; //Paper - fix blockstate capture undoing
|
|
CraftBlockState blockstate = (CraftBlockState) world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getState(); // Paper - use CB getState to get a suitable snapshot
|
|
this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate);
|
|
}
|
|
@@ -364,7 +366,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
|
|
|
if (iblockdata1 == null) {
|
|
// CraftBukkit start - remove blockstate if failed
|
|
- if (this.captureBlockStates) {
|
|
+ if (/*this.captureBlockStates*/ capturedBlockState) { //Paper - fix blockstate capture undoing
|
|
this.capturedBlockStates.remove(blockposition);
|
|
}
|
|
// CraftBukkit end
|
|
--
|
|
2.25.1
|
|
|