1 files changed, 45 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0376-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches-Unmapped/0376-Prevent-consuming-the-wrong-itemstack.patch
new file mode 100644
index 0000000000..743d331f2f
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0376-Prevent-consuming-the-wrong-itemstack.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kickash32 <[email protected]>
+Date: Mon, 19 Aug 2019 19:42:35 +0500
+Subject: [PATCH] Prevent consuming the wrong itemstack
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
+index ecceb272028e1ae1dd40c0c39d6f687fccfabb58..903c3cfdaae3dd1750aa2f32f6cdbb423909eb47 100644
+--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
++++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
+@@ -3201,10 +3201,13 @@ public abstract class EntityLiving extends Entity {
+         this.datawatcher.set(EntityLiving.ag, (byte) j);
+     }
+ 
+-    public void c(EnumHand enumhand) {
++    // Paper start -- OBFHELPER and forwarder to method with forceUpdate parameter
++    public void c(EnumHand enumhand) { this.updateActiveItem(enumhand, false); }
++    public void updateActiveItem(EnumHand enumhand, boolean forceUpdate) {
++    // Paper end
+         ItemStack itemstack = this.b(enumhand);
+ 
+-        if (!itemstack.isEmpty() && !this.isHandRaised()) {
++        if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag
+             this.activeItem = itemstack;
+             this.bd = itemstack.k();
+             if (!this.world.isClientSide) {
+@@ -3282,6 +3285,7 @@ public abstract class EntityLiving extends Entity {
+             this.releaseActiveItem();
+         } else {
+             if (!this.activeItem.isEmpty() && this.isHandRaised()) {
++                this.updateActiveItem(this.getRaisedHand(), true); // Paper
+                 this.b(this.activeItem, 16);
+                 // CraftBukkit start - fire PlayerItemConsumeEvent
+                 ItemStack itemstack;
+@@ -3316,8 +3320,8 @@ public abstract class EntityLiving extends Entity {
+                 }
+ 
+                 this.clearActiveItem();
+-                // Paper start - if the replacement is anything but the default, update the client inventory
+-                if (this instanceof EntityPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
++                // Paper start
++                if (this instanceof EntityPlayer) {
+                     ((EntityPlayer) this).getBukkitEntity().updateInventory();
+                 }
+                 // Paper end