5960af9d87
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 7da4c0be SPIGOT-6729: Add Chunk.isEntitiesLoaded() CraftBukkit Changes: 9217b523 #929: Call EntityBlockFormEvent for Wither Rose placed by dead entity 757d42ae SPIGOT-6729: Add Chunk.isEntitiesLoaded()
53 lines
2.7 KiB
Diff
53 lines
2.7 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/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index aecb662a8e9e803b619a88d1d1637386fb39c679..bb0b7da2e6bfd35bf3f937af928d515ef59401fb 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3555,15 +3555,18 @@ public abstract class LivingEntity extends Entity {
|
|
this.entityData.set(LivingEntity.DATA_LIVING_ENTITY_FLAGS, (byte) j);
|
|
}
|
|
|
|
- public void startUsingItem(InteractionHand hand) {
|
|
- ItemStack itemstack = this.getItemInHand(hand);
|
|
+ // Paper start -- OBFHELPER and forwarder to method with forceUpdate parameter
|
|
+ public void startUsingItem(InteractionHand hand) { this.updateActiveItem(hand, false); }
|
|
+ public void updateActiveItem(InteractionHand enumhand, boolean forceUpdate) {
|
|
+ // Paper end
|
|
+ ItemStack itemstack = this.getItemInHand(enumhand);
|
|
|
|
- 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) {
|
|
this.setLivingEntityFlag(1, true);
|
|
- this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND);
|
|
+ this.setLivingEntityFlag(2, enumhand == InteractionHand.OFF_HAND);
|
|
}
|
|
|
|
}
|
|
@@ -3636,6 +3639,7 @@ public abstract class LivingEntity extends Entity {
|
|
this.releaseUsingItem();
|
|
} else {
|
|
if (!this.useItem.isEmpty() && this.isUsingItem()) {
|
|
+ this.updateActiveItem(this.getUsedItemHand(), true); // Paper
|
|
this.triggerItemUseEffects(this.useItem, 16);
|
|
// CraftBukkit start - fire PlayerItemConsumeEvent
|
|
ItemStack itemstack;
|
|
@@ -3670,8 +3674,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
|