From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
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/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 00900427e88f8e9118df4fb2e0e98c26b9f1b7d4..077e5f4f787cdf4b8e7ba08dbc0c7bf04a6e5b93 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3558,9 +3558,14 @@ public abstract class LivingEntity extends Entity {
     }
 
     public void startUsingItem(InteractionHand hand) {
+        // Paper start - forwarder to method with forceUpdate parameter
+        this.startUsingItem(hand, false);
+    }
+    public void startUsingItem(InteractionHand hand, boolean forceUpdate) {
+        // Paper end
         ItemStack itemstack = this.getItemInHand(hand);
 
-        if (!itemstack.isEmpty() && !this.isUsingItem()) {
+        if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag
             this.useItem = itemstack;
             this.useItemRemaining = itemstack.getUseDuration();
             if (!this.level.isClientSide) {
@@ -3638,6 +3643,7 @@ public abstract class LivingEntity extends Entity {
             this.releaseUsingItem();
         } else {
             if (!this.useItem.isEmpty() && this.isUsingItem()) {
+                this.startUsingItem(this.getUsedItemHand(), true); // Paper
                 this.triggerItemUseEffects(this.useItem, 16);
                 // CraftBukkit start - fire PlayerItemConsumeEvent
                 ItemStack itemstack;
@@ -3672,8 +3678,8 @@ public abstract class LivingEntity extends Entity {
                 }
 
                 this.stopUsingItem();
-                // Paper start - if the replacement is anything but the default, update the client inventory
-                if (this instanceof ServerPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
+                // Paper start
+                if (this instanceof ServerPlayer) {
                     ((ServerPlayer) this).getBukkitEntity().updateInventory();
                 }
                 // Paper end