From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 22 Dec 2020 13:52:48 -0800 Subject: [PATCH] Added EntityDamageItemEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java index 40395738e41575a5b2b1b4020c1c60707ceac9ad..a6858017ff9468dbf4651fe62faea487a54b3878 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -556,7 +556,7 @@ public final class ItemStack { return this.getItem().getMaxDamage(); } - public boolean hurt(int amount, RandomSource random, @Nullable ServerPlayer player) { + public boolean hurt(int amount, RandomSource random, @Nullable LivingEntity player) { // Paper - allow any living entity instead of only ServerPlayers if (!this.isDamageableItem()) { return false; } else { @@ -574,8 +574,8 @@ public final class ItemStack { amount -= k; // CraftBukkit start - if (player != null) { - PlayerItemDamageEvent event = new PlayerItemDamageEvent(player.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); + if (player instanceof ServerPlayer serverPlayer) { // Paper + PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); // Paper event.getPlayer().getServer().getPluginManager().callEvent(event); if (amount != event.getDamage() || event.isCancelled()) { @@ -586,6 +586,14 @@ public final class ItemStack { } amount = event.getDamage(); + // Paper start - EntityDamageItemEvent + } else if (player != null) { + io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount); + if (!event.callEvent()) { + return false; + } + amount = event.getDamage(); + // Paper end } // CraftBukkit end if (amount <= 0) { @@ -593,8 +601,8 @@ public final class ItemStack { } } - if (player != null && amount != 0) { - CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(player, this, this.getDamageValue() + amount); + if (player instanceof ServerPlayer serverPlayer && amount != 0) { // Paper + CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(serverPlayer, this, this.getDamageValue() + amount); // Paper } j = this.getDamageValue() + amount; @@ -606,7 +614,7 @@ public final class ItemStack { public void hurtAndBreak(int amount, T entity, Consumer breakCallback) { if (!entity.level.isClientSide && (!(entity instanceof net.minecraft.world.entity.player.Player) || !((net.minecraft.world.entity.player.Player) entity).getAbilities().instabuild)) { if (this.isDamageableItem()) { - if (this.hurt(amount, entity.getRandom(), entity instanceof ServerPlayer ? (ServerPlayer) entity : null)) { + if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent breakCallback.accept(entity); Item item = this.getItem(); // CraftBukkit start - Check for item breaking