Prepare for updating server patches

2021-11-23 00:57:41 -08:00 · 2021-11-23 00:57:41 -08:00 · ed6d43ddb0
commit ed6d43ddb0
parent cb95469f99
1192 changed files with 248 additions and 309 deletions
--- a/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 20 May 2021 22:16:37 -0700
-Subject: [PATCH] Fix PlayerBucketEmptyEvent result itemstack
-
-Fixes SPIGOT-2560: https://hub.spigotmc.org/jira/projects/SPIGOT/issues/SPIGOT-2560
-
-diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/BucketItem.java
-+++ b/src/main/java/net/minecraft/world/item/BucketItem.java
-@@ -0,0 +0,0 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
- 
- public class BucketItem extends Item implements DispensibleContainerItem {
- 
-+    private static ItemStack itemLeftInHandAfterPlayerBucketEmptyEvent = null; // Paper
-+
-     public final Fluid content;
- 
-     public BucketItem(Fluid fluid, Item.Properties settings) {
-@@ -0,0 +0,0 @@ public class BucketItem extends Item implements DispensibleContainerItem {
-     }
- 
-     public static ItemStack getEmptySuccessItem(ItemStack stack, Player player) {
-+        // Paper start
-+        if (itemLeftInHandAfterPlayerBucketEmptyEvent != null) {
-+            ItemStack itemInHand = itemLeftInHandAfterPlayerBucketEmptyEvent;
-+            itemLeftInHandAfterPlayerBucketEmptyEvent = null;
-+            return itemInHand;
-+        }
-+        // Paper end
-         return !player.getAbilities().instabuild ? new ItemStack(Items.BUCKET) : stack;
-     }
- 
-@@ -0,0 +0,0 @@ public class BucketItem extends Item implements DispensibleContainerItem {
-                     ((ServerPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
-                     return false;
-                 }
-+                // Paper start
-+                itemLeftInHandAfterPlayerBucketEmptyEvent = event.getItemStack().equals(CraftItemStack.asNewCraftStack(net.minecraft.world.item.Items.BUCKET)) ? null : CraftItemStack.asNMSCopy(event.getItemStack());
-+                // Paper end
-             }
-             // CraftBukkit end
-             if (!flag1) {