Paper/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch

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 75beea5653d04555b46c4b3a2054405c6aefc421..2b2258b8cc35385b857114d0e8a958cd24fa7d26 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3567,9 +3567,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) {
@@ -3648,6 +3653,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;
@@ -3682,8 +3688,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