Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11197)

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

Bukkit Changes:
2ec53f49 PR-1050: Fix empty result check for Complex Recipes
10671012 PR-1044: Add CrafterCraftEvent
4d87ffe0 Use correct method in JavaDoc
ae5e5817 SPIGOT-7850: Add API for Bogged shear state
46b6d445 SPIGOT-7837: Support data pack banner patterns
d5d0cefc Fix JavaDoc error
b3c2b83d PR-1036: Add API for InventoryView derivatives
1fe2c75a SPIGOT-7809: Add ShieldMeta

CraftBukkit Changes:
8ee6fd1b8 SPIGOT-7857: Improve ItemMeta block data deserialization
8f26c30c6 SPIGOT-7857: Fix spurious internal NBT tag when deserializing BlockStateMeta
759061b93 SPIGOT-7855: Fire does not spread or burn blocks
00fc9fb64 SPIGOT-7853: AnvilInventory#getRepairCost() always returns 0
7501e2e04 PR-1450: Add CrafterCraftEvent
8c51673e7 SPIGOT-5731: PortalCreateEvent#getEntity returns null for nether portals ignited by flint and steel
d53d0d0b1 PR-1456: Fix inverted logic in CraftCrafterView#setSlotDisabled
682a678c8 SPIGOT-7850: Add API for Bogged shear state
fccf5243a SPIGOT-7837: Support data pack banner patterns
9c3bd4390 PR-1431: Add API for InventoryView derivatives
0cc6acbc4 SPIGOT-7849: Fix FoodComponent serialize with "using-converts-to" using null
2c5474952 Don't rely on tags for CraftItemMetas
20d107e46 SPIGOT-7846: Fix ItemMeta for hanging signs
76f59e315 Remove redundant clone in Dropper InventoryMoveItemEvent
e61a53d25 SPIGOT-7817: Call InventoryMoveItemEvent for Crafters
894682e2d SPIGOT-7839: Remove redundant Java version checks
2c12b2187 SPIGOT-7809: Add ShieldMeta and fix setting shield base colours

Spigot Changes:
fb8fb722 Rebuild patches
34bd42b7 SPIGOT-7835: Fix issue with custom hopper settings

1 files changed, 171 insertions, 0 deletions

diff --git a/patches/server/0916-Dont-resend-blocks-on-interactions.patch b/patches/server/0916-Dont-resend-blocks-on-interactions.patch
new file mode 100644
index 0000000000..822d354138
--- /dev/null
+++ b/patches/server/0916-Dont-resend-blocks-on-interactions.patch
@@ -0,0 +1,171 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Tue, 27 Jun 2023 21:09:11 -0400
+Subject: [PATCH] Dont resend blocks on interactions
+
+In general, the client now has an acknowledgment system which will prevent block changes made by the client to be reverted correctly.
+
+It should be noted that this system does not yet support block entities, so those still need to resynced when needed.
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+index d839f8df658c894f144ba4637d290ffbed77e132..415d9802ae4dd75b44055b8faf19672fa50c585f 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+@@ -204,7 +204,7 @@ public class ServerPlayerGameMode {
+                 PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, pos, direction, this.player.getInventory().getSelected(), InteractionHand.MAIN_HAND);
+                 if (event.isCancelled()) {
+                     // Let the client know the block still exists
+-                    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
++                    // this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos)); // Paper - Don't resync blocks
+                     // Update any tile entity data for this block
+                     capturedBlockEntity = true; // Paper - Send block entities after destroy prediction
+                     return;
+@@ -219,7 +219,7 @@ public class ServerPlayerGameMode {
+                 // Spigot start - handle debug stick left click for non-creative
+                 if (this.player.getMainHandItem().is(net.minecraft.world.item.Items.DEBUG_STICK)
+                         && ((net.minecraft.world.item.DebugStickItem) net.minecraft.world.item.Items.DEBUG_STICK).handleInteraction(this.player, this.level.getBlockState(pos), this.level, pos, false, this.player.getMainHandItem())) {
+-                    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
++                    // this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos)); // Paper - Don't resync block
+                     return;
+                 }
+                 // Spigot end
+@@ -237,15 +237,17 @@ public class ServerPlayerGameMode {
+                 // CraftBukkit start - Swings at air do *NOT* exist.
+                 if (event.useInteractedBlock() == Event.Result.DENY) {
+                     // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
+-                    BlockState data = this.level.getBlockState(pos);
+-                    if (data.getBlock() instanceof DoorBlock) {
+-                        // For some reason *BOTH* the bottom/top part have to be marked updated.
+-                        boolean bottom = data.getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
+-                        this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
+-                        this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, bottom ? pos.above() : pos.below()));
+-                    } else if (data.getBlock() instanceof TrapDoorBlock) {
+-                        this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
+-                    }
++                    // Paper start - Don't resync blocks
++                    //BlockState data = this.level.getBlockState(pos);
++                    //if (data.getBlock() instanceof DoorBlock) {
++                    //    // For some reason *BOTH* the bottom/top part have to be marked updated.
++                    //    boolean bottom = data.getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
++                    //    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
++                    //    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, bottom ? pos.above() : pos.below()));
++                    //} else if (data.getBlock() instanceof TrapDoorBlock) {
++                    //    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
++                    //}
++                    // Paper end - Don't resync blocks
+                 } else if (!iblockdata.isAir()) {
+                     EnchantmentHelper.onHitBlock(this.level, this.player.getMainHandItem(), this.player, this.player, EquipmentSlot.MAINHAND, Vec3.atCenterOf(pos), iblockdata, (item) -> {
+                         this.player.onEquippedItemBroken(item, EquipmentSlot.MAINHAND);
+@@ -257,7 +259,7 @@ public class ServerPlayerGameMode {
+                 if (event.useItemInHand() == Event.Result.DENY) {
+                     // If we 'insta destroyed' then the client needs to be informed.
+                     if (f > 1.0f) {
+-                        this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
++                        // this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos)); // Paper - Don't resync blocks
+                     }
+                     return;
+                 }
+@@ -265,7 +267,7 @@ public class ServerPlayerGameMode {
+ 
+                 if (blockEvent.isCancelled()) {
+                     // Let the client know the block still exists
+-                    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
++                    // this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos)); // Paper - Don't resync block
+                     return;
+                 }
+ 
+@@ -356,7 +358,7 @@ public class ServerPlayerGameMode {
+ 
+             // Tell client the block is gone immediately then process events
+             // Don't tell the client if its a creative sword break because its not broken!
+-            if (this.level.getBlockEntity(pos) == null && !isSwordNoBreak) {
++            if (false && this.level.getBlockEntity(pos) == null && !isSwordNoBreak) { // Paper - Don't resync block
+                 ClientboundBlockUpdatePacket packet = new ClientboundBlockUpdatePacket(pos, Blocks.AIR.defaultBlockState());
+                 this.player.connection.send(packet);
+             }
+@@ -382,13 +384,15 @@ public class ServerPlayerGameMode {
+                 if (isSwordNoBreak) {
+                     return false;
+                 }
++                // Paper start - Don't resync blocks
+                 // Let the client know the block still exists
+-                this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
++                //this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
+ 
+                 // Brute force all possible updates
+-                for (Direction dir : Direction.values()) {
+-                    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos.relative(dir)));
+-                }
++                //for (Direction dir : Direction.values()) {
++                //    this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos.relative(dir)));
++                //}
++                // Paper end - Don't resync blocks
+ 
+                 // Update any tile entity data for this block
+                 if (!captureSentBlockEntities) { // Paper - Send block entities after destroy prediction
+@@ -537,16 +541,18 @@ public class ServerPlayerGameMode {
+         if (event.useInteractedBlock() == Event.Result.DENY) {
+             // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
+             if (iblockdata.getBlock() instanceof DoorBlock) {
+-                boolean bottom = iblockdata.getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
+-                player.connection.send(new ClientboundBlockUpdatePacket(world, bottom ? blockposition.above() : blockposition.below()));
++                // Paper start - Don't resync blocks
++                // boolean bottom = iblockdata.getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
++                // player.connection.send(new ClientboundBlockUpdatePacket(world, bottom ? blockposition.above() : blockposition.below()));
++                // Paper end - Don't resync blocks
+             } else if (iblockdata.getBlock() instanceof CakeBlock) {
+                 player.getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
+             } else if (this.interactItemStack.getItem() instanceof DoubleHighBlockItem) {
+                 // send a correcting update to the client, as it already placed the upper half of the bisected item
+-                player.connection.send(new ClientboundBlockUpdatePacket(world, blockposition.relative(hitResult.getDirection()).above()));
++                //player.connection.send(new ClientboundBlockUpdatePacket(world, blockposition.relative(hitResult.getDirection()).above())); // Paper - Don't resync blocks
+ 
+                 // send a correcting update to the client for the block above as well, this because of replaceable blocks (such as grass, sea grass etc)
+-                player.connection.send(new ClientboundBlockUpdatePacket(world, blockposition.above()));
++                //player.connection.send(new ClientboundBlockUpdatePacket(world, blockposition.above())); // Paper - Don't resync blocks
+             // Paper start - extend Player Interact cancellation // TODO: consider merging this into the extracted method
+             } else if (iblockdata.is(Blocks.JIGSAW) || iblockdata.is(Blocks.STRUCTURE_BLOCK) || iblockdata.getBlock() instanceof net.minecraft.world.level.block.CommandBlock) {
+                 player.connection.send(new net.minecraft.network.protocol.game.ClientboundContainerClosePacket(this.player.containerMenu.containerId));
+diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
+index 6caed156ed0cfe0017d578f58cb963ee68272d78..321188173918d0d60858a258400dfd682ccdb21c 100644
+--- a/src/main/java/net/minecraft/world/item/BucketItem.java
++++ b/src/main/java/net/minecraft/world/item/BucketItem.java
+@@ -79,7 +79,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
+                         PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) world, user, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem(), hand);
+ 
+                         if (event.isCancelled()) {
+-                            ((ServerPlayer) user).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-5163 (see PlayerInteractManager)
++                            // ((ServerPlayer) user).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-5163 (see PlayerInteractManager) // Paper - Don't resend blocks
+                             ((ServerPlayer) user).getBukkitEntity().updateInventory(); // SPIGOT-4541
+                             return InteractionResultHolder.fail(itemstack);
+                         }
+@@ -187,7 +187,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
+             if (flag2 && entityhuman != null) {
+                 PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent((ServerLevel) world, entityhuman, blockposition, clicked, enumdirection, itemstack, enumhand);
+                 if (event.isCancelled()) {
+-                    ((ServerPlayer) entityhuman).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-4238: needed when looking through entity
++                    // ((ServerPlayer) entityhuman).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-4238: needed when looking through entity // Paper - Don't resend blocks
+                     ((ServerPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
+                     return false;
+                 }
+diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+index 11c507b399f97c4c0bbe220e8a3c1cdb851c8a0a..ebe470ca361ec5747a843b60d82f567d41d7c9fa 100644
+--- a/src/main/java/net/minecraft/world/item/ItemStack.java
++++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+@@ -500,10 +500,12 @@ public final class ItemStack implements DataComponentHolder {
+                     world.preventPoiUpdated = false;
+ 
+                     // Brute force all possible updates
+-                    BlockPos placedPos = ((CraftBlock) placeEvent.getBlock()).getPosition();
+-                    for (Direction dir : Direction.values()) {
+-                        ((ServerPlayer) entityhuman).connection.send(new ClientboundBlockUpdatePacket(world, placedPos.relative(dir)));
+-                    }
++                    // Paper start - Don't resync blocks
++                    // BlockPos placedPos = ((CraftBlock) placeEvent.getBlock()).getPosition();
++                    // for (Direction dir : Direction.values()) {
++                    //     ((ServerPlayer) entityhuman).connection.send(new ClientboundBlockUpdatePacket(world, placedPos.relative(dir)));
++                    // }
++                    // Paper end - Don't resync blocks
+                     SignItem.openSign = null; // SPIGOT-6758 - Reset on early return
+                 } else {
+                     // Change the stack to its new contents if it hasn't been tampered with.