From d4dcc1a2e65c14a9c84f6a723ec4f75597b88f51 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 6 Feb 2021 00:02:44 +0000 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: e5cb519d #793: Don't unnecessarily toString block in CraftBlockEntityState constructor --- .../0178-API-to-get-a-BlockState-without-a-snapshot.patch | 4 ++-- work/CraftBukkit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch index 03f58557fc..5b0bd5b5b1 100644 --- a/Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch @@ -81,12 +81,12 @@ index 5de8463c94612edd11e02ac5d9757382c9598e7d..661bb54c27966c8050644b293d99dfe8 switch (material) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 26cc40e57f5b73b9c32859bff37c4a3d94904c56..feeae1a9eb309ae4101783b191bb2bffe9aeb7d3 100644 +index 8a7e9302b4b6be086144add8df610b76b58e00d6..cca1c2ca5c1fe91fda30ace6f06a343b7850842e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -26,20 +26,40 @@ public class CraftBlockEntityState extends CraftBlockState this.tileEntity = tileEntityClass.cast(world.getHandle().getTileEntity(this.getPosition())); - Preconditions.checkState(this.tileEntity != null, "Tile is null, asynchronous access? " + block); + Preconditions.checkState(this.tileEntity != null, "Tile is null, asynchronous access? %s", block); + // Paper start + this.snapshotDisabled = DISABLE_SNAPSHOT; diff --git a/work/CraftBukkit b/work/CraftBukkit index c631fe5579..e5cb519d6a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c631fe557977348f9e8a82bfc168d61584cdc1b0 +Subproject commit e5cb519d6a4a65eae882df759233890bc518cc0f