46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
|
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/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
index 4e2039e46741e8a09f3af7d3d9e98ef7a5b27abc..48f932b2e049741ebee5824e158e4bda87d42faf 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
|