Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-16 04:50:05 +01:00
bc127ea819
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: eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent 205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron CraftBukkit Changes: b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket 4f34a67b #891: Fix scheduler task ID overflow and duplication issues Spigot Changes: d03d7f12 BUILDTOOLS-604: Rebuild patches
53 Zeilen
2.7 KiB
Diff
53 Zeilen
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 f6ed1ec062eef635b8e629b0e200185054c15919..b9b01966cdaf01bfe222c89c8e5d7afc690ab415 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3554,15 +3554,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);
|
|
}
|
|
|
|
}
|
|
@@ -3635,6 +3638,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;
|
|
@@ -3669,8 +3673,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
|