From 8cccd125e76163c0be5cb083adf5294ff834da17 Mon Sep 17 00:00:00 2001 From: Automated Date: Wed, 7 Apr 2021 01:17:32 -0400 Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit/Spigot) 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: 221aed6cf SPIGOT-6413: Server Corruption Changing Blocks in Piston Events 721c4966b SPIGOT-6411: The PlayerEditBookEvent is not called when the player edits a book in the off-hand. be0e94581 Add mc-dev imports Spigot Changes: a25e8ed2 Remove mc-dev imports --- .../Optimize-NibbleArray-to-use-pooled-buffers.patch | 1 + work/CraftBukkit | 2 +- work/Spigot | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/Optimize-NibbleArray-to-use-pooled-buffers.patch index 70b67dfd2e..66204e52c3 100644 --- a/Spigot-Server-Patches/Optimize-NibbleArray-to-use-pooled-buffers.patch +++ b/Spigot-Server-Patches/Optimize-NibbleArray-to-use-pooled-buffers.patch @@ -127,6 +127,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/level/chunk/NibbleArray.java +++ b/src/main/java/net/minecraft/world/level/chunk/NibbleArray.java @@ -0,0 +0,0 @@ + // mc-dev import package net.minecraft.world.level.chunk; +import com.destroystokyo.paper.util.pooled.PooledObjects; // Paper diff --git a/work/CraftBukkit b/work/CraftBukkit index 0791e54abf..221aed6cf5 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 0791e54abfeb31efdfb5cd2fc738508d5c0890d2 +Subproject commit 221aed6cf5b07b1454cf60231f40a7831ce519e9 diff --git a/work/Spigot b/work/Spigot index 1ad83543c0..a25e8ed26c 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 1ad83543c04b26f4da8a2b7cf206b41ad8028063 +Subproject commit a25e8ed26cbca903b4d6ee3823d1b9f4f5d06cc3