OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Correctly check enchants for ItemStack#damage (#11240)

Browse source
This commit is contained in:
Jake Potrebic 2024-08-11 13:27:24 -07:00
parent e0bec73f14
commit e574dc326d
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
patches/server/ItemStack-damage-API.patch
View file

@ -28,11 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (player == null || !player.hasInfiniteMaterials() || force) { // Paper + if (player == null || !player.hasInfiniteMaterials() || force) { // Paper
if (amount > 0) { if (amount > 0) {
int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent
- amount = EnchantmentHelper.processDurabilityChange(world, this, amount); amount = EnchantmentHelper.processDurabilityChange(world, this, amount);
+ if (!force) amount = EnchantmentHelper.processDurabilityChange(world, this, amount); // Paper - itemstack damage API - do not consider enchantments when damaging from API
// CraftBukkit start
if (player instanceof ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount, originalDamage); // Paper - Add EntityDamageItemEvent & Expand PlayerItemDamageEvent
@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder { @@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
} }