upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cache this.useItem before running item break logic, Fixes #10344 (#10376)

Browse Source
This commit is contained in:
Jonathing authored and GitHub committed 2025-03-04 13:30:10 -08:00
1 parent 1596190810
commit 8f074e1da1
1 file changed
+11 -3
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/world/entity/player/Player.java.patch
+11 -3
View File
@@ -135,15 +135,23 @@
if (!this.m_9236_().f_46443_) {
this.m_36246_(Stats.f_12982_.m_12902_(this.f_20935_.m_41720_()));
}
@@ -865,6 +_,8 @@
@@ -863,10 +_,15 @@
if (p_36383_ >= 3.0F) {
int i = 1 + Mth.m_14143_(p_36383_);
InteractionHand interactionhand = this.m_7655_();
+ // FORGE: cache this.useItem -- if this.stopUsingItem() is called, it will be set to ItemStack.EMPTY
+ ItemStack currentItem = this.f_20935_;
this.f_20935_.m_41622_(i, this, (p_219739_) -> {
p_219739_.m_21190_(interactionhand);
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, this.f_20935_, interactionhand);
+ m_5810_(); // Forge: fix MC-168573
+ if (this.f_20935_ == currentItem) m_5810_(); // Forge: fix MC-168573
});
if (this.f_20935_.m_41619_()) {
- if (this.f_20935_.m_41619_()) {
+ // FORGE: use cached item since this.useItem could be ItemStack.EMPTY
+ if (currentItem.m_41619_()) {
if (interactionhand == InteractionHand.MAIN_HAND) {
this.m_8061_(EquipmentSlot.MAINHAND, ItemStack.f_41583_);
} else {
@@ -883,10 +_,13 @@
protected void m_6475_(DamageSource p_36312_, float p_36313_) {