From 285a69dbe1fa6ec23cf499842619d9c027bc55ce Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 3 Nov 2018 04:50:42 -0400
Subject: [PATCH] Use empty itemstack, not null in PlayerInteractManager

Introduced in 93e5439f9621013a209ea24dd57feebcce6589c2
Fixes GH-1642
---
 ...MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index df368224e2..4d919152ea 100644
--- a/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -13,14 +13,14 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 23fc4d8e14..599bdf054f 100644
+index 23fc4d8e1..0b6c25936 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -0,0 +0,0 @@ public class PlayerInteractManager {
                      ItemStack itemstack1 = this.player.getItemInMainHand();
                      boolean flag1 = this.player.hasBlock(iblockdata);
  
-+                    ItemStack itemstack2 = flag && flag1 && event.isDropItems() && !itemstack1.isEmpty() ? itemstack1.cloneItemStack() : null; // Paper - MC-136865 - clone before use
++                    ItemStack itemstack2 = flag && flag1 && event.isDropItems() && !itemstack1.isEmpty() ? itemstack1.cloneItemStack() : ItemStack.a; // Paper - MC-136865 - clone before use
                      itemstack1.a(this.world, iblockdata, blockposition, this.player);
                      // CraftBukkit start - Check if block should drop items
                      if (flag && flag1 && event.isDropItems()) {