From 93ff88d6c87ac74805c46ebab0b7c34b42e7a61d 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 --- .../API-to-get-a-BlockState-without-a-snapshot.patch | 2 +- work/CraftBukkit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch index 64f87ae33d..25a82c3c3c 100644 --- a/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch @@ -86,7 +86,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -0,0 +0,0 @@ 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