From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 19:42:35 +0500 Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index f74e9ffda092ef4a2e30c316e682af154921b5df..961a383174cd40da079869a2a1f0252c27fff6b4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3068,10 +3068,13 @@ public abstract class EntityLiving extends Entity { this.datawatcher.set(EntityLiving.an, (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.bk = itemstack.k(); if (!this.world.isClientSide) { @@ -3147,6 +3150,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; @@ -3177,8 +3181,8 @@ public abstract class EntityLiving extends Entity { this.a(this.getRaisedHand(), itemstack); // CraftBukkit end 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