From 2fcdb1b8edefba96bf1785efb7c3720982a40754 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 16 Jan 2022 12:08:24 -0800
Subject: [PATCH] Fix NPE for bucket empty result stack being null (#7354)

---
 .../Fix-PlayerBucketEmptyEvent-result-itemstack.patch       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 8a951512e..538949bdf 100644
--- a/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  public class BucketItem extends Item implements DispensibleContainerItem {
  
-+    private static ItemStack itemLeftInHandAfterPlayerBucketEmptyEvent = null; // Paper
++    private static @Nullable ItemStack itemLeftInHandAfterPlayerBucketEmptyEvent = null; // Paper
 +
      public final Fluid content;
  
@@ -36,9 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      ((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
++                itemLeftInHandAfterPlayerBucketEmptyEvent = event.getItemStack() != null ? event.getItemStack().equals(CraftItemStack.asNewCraftStack(net.minecraft.world.item.Items.BUCKET)) ? null : CraftItemStack.asNMSCopy(event.getItemStack()) : ItemStack.EMPTY; // Paper - fix empty event result itemstack
              }
              // CraftBukkit end
              if (!flag1) {