mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 05:02:18 +00:00
This commit is contained in:
1 parent
124b9bd8d3
commit
55862dfd1d
7 files changed
+368
-9
No files matched your search
@@ -142,6 +142,19 @@
|
||||
if (!this.level().isClientSide) {
|
||||
this.awardStat(Stats.ITEM_USED.get(this.useItem.getItem()));
|
||||
}
|
||||
@@ -931,8 +_,11 @@
|
||||
if (p_36383_ >= 3.0F) {
|
||||
int i = 1 + Mth.floor(p_36383_);
|
||||
InteractionHand interactionhand = this.getUsedItemHand();
|
||||
+ // FORGE: cache this.useItem -- if this.stopUsingItem() is called, it will be set to ItemStack.EMPTY
|
||||
+ ItemStack currentItem = this.useItem;
|
||||
this.useItem.hurtAndBreak(i, this, getSlotForHand(interactionhand));
|
||||
- if (this.useItem.isEmpty()) {
|
||||
+ // FORGE: use cached item since this.useItem could be ItemStack.EMPTY
|
||||
+ if (currentItem.isEmpty()) {
|
||||
if (interactionhand == InteractionHand.MAIN_HAND) {
|
||||
this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
|
||||
} else {
|
||||
@@ -949,10 +_,13 @@
|
||||
@Override
|
||||
protected void actuallyHurt(ServerLevel p_365751_, DamageSource p_36312_, float p_36313_) {
|
||||
|
||||
@@ -33,6 +33,34 @@
|
||||
if (player != null && interactionresult instanceof InteractionResult.Success interactionresult$success && interactionresult$success.wasItemInteraction()) {
|
||||
player.awardStat(Stats.ITEM_USED.get(item));
|
||||
}
|
||||
@@ -468,18 +_,26 @@
|
||||
}
|
||||
|
||||
public void hurtAndBreak(int p_220158_, ServerLevel p_342197_, @Nullable ServerPlayer p_220160_, Consumer<Item> p_343361_) {
|
||||
- int i = this.processDurabilityChange(p_220158_, p_342197_, p_220160_);
|
||||
+ // FORGE: use context-sensitive sister of processDurabilityChange that calls IForgeItem.damageItem
|
||||
+ int i = this.processDurabilityChange(p_220158_, p_342197_, p_220160_, true, p_343361_);
|
||||
if (i != 0) {
|
||||
this.applyDamage(this.getDamageValue() + i, p_220160_, p_343361_);
|
||||
}
|
||||
}
|
||||
|
||||
private int processDurabilityChange(int p_362423_, ServerLevel p_364910_, @Nullable ServerPlayer p_365570_) {
|
||||
+ return this.processDurabilityChange(p_362423_, p_364910_, p_365570_, false, p_359411_ -> { });
|
||||
+ }
|
||||
+
|
||||
+ /** FORGE: context-sensitive sister of processDurabilityChange that calls IForgeItem.damageItem */
|
||||
+ private int processDurabilityChange(int p_362423_, ServerLevel p_364910_, @Nullable ServerPlayer p_365570_, boolean canBreak, Consumer<Item> onBreak) {
|
||||
if (!this.isDamageableItem()) {
|
||||
return 0;
|
||||
} else if (p_365570_ != null && p_365570_.hasInfiniteMaterials()) {
|
||||
return 0;
|
||||
} else {
|
||||
+ // FORGE: modify the base damage based on the item's impl of IForgeItem.damageItem
|
||||
+ p_362423_ = this.damageItem(p_362423_, p_364910_, p_365570_, canBreak, onBreak);
|
||||
return p_362423_ > 0 ? EnchantmentHelper.processDurabilityChange(p_364910_, this, p_362423_) : p_362423_;
|
||||
}
|
||||
}
|
||||
@@ -516,7 +_,13 @@
|
||||
p_41623_,
|
||||
serverlevel,
|
||||
@@ -41,7 +69,7 @@
|
||||
+ p_341563_ -> {
|
||||
+ if (p_41624_ instanceof Player player) {
|
||||
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, this, p_335324_);
|
||||
+ player.stopUsingItem(); // Forge: fix MC-168573
|
||||
+ if (player.getUseItem() == this) player.stopUsingItem(); // Forge: fix MC-168573
|
||||
+ }
|
||||
+ p_41624_.onEquippedItemBroken(p_341563_, p_335324_);
|
||||
+ }
|
||||
|
||||
Reference in new issue
Block a user