PaperMC/patches/server/0596-Add-EntityDamageItemEvent.patch

66 lines
3.7 KiB
Diff
Raw Normal View History

2021-08-10 07:04:44 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 22 Dec 2020 13:52:48 -0800
Subject: [PATCH] Add EntityDamageItemEvent
2021-08-10 07:04:44 +02:00
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
2024-04-25 05:14:51 +02:00
index c8af2f886ad834d6a405df00560b0f8225fcf471..2623df859c2e484515abf53e3f35d0335467dceb 100644
2021-08-10 07:04:44 +02:00
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
2024-04-25 05:14:51 +02:00
@@ -648,7 +648,7 @@ public final class ItemStack implements DataComponentHolder {
2024-04-24 17:27:28 +02:00
return (Integer) this.getOrDefault(DataComponents.MAX_DAMAGE, 0);
2021-08-10 07:04:44 +02:00
}
2024-04-24 17:27:28 +02:00
- public void hurtAndBreak(int amount, RandomSource random, @Nullable ServerPlayer player, Runnable breakCallback) {
+ public void hurtAndBreak(int amount, RandomSource random, @Nullable LivingEntity player, Runnable breakCallback) { // Paper - Add EntityDamageItemEvent
if (this.isDamageableItem()) {
int j;
2024-04-25 05:14:51 +02:00
@@ -664,8 +664,8 @@ public final class ItemStack implements DataComponentHolder {
2021-08-10 07:04:44 +02:00
amount -= k;
// CraftBukkit start
- if (player != null) {
- PlayerItemDamageEvent event = new PlayerItemDamageEvent(player.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount);
+ if (player instanceof ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
+ PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); // Paper - Add EntityDamageItemEvent
2021-08-10 07:04:44 +02:00
event.getPlayer().getServer().getPluginManager().callEvent(event);
if (amount != event.getDamage() || event.isCancelled()) {
2024-04-25 05:14:51 +02:00
@@ -676,6 +676,14 @@ public final class ItemStack implements DataComponentHolder {
2021-08-10 07:04:44 +02:00
}
amount = event.getDamage();
+ // Paper start - Add EntityDamageItemEvent
2021-08-10 07:04:44 +02:00
+ } 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 - Add EntityDamageItemEvent
2021-08-10 07:04:44 +02:00
}
// CraftBukkit end
if (amount <= 0) {
2024-04-25 05:14:51 +02:00
@@ -683,8 +691,8 @@ public final class ItemStack implements DataComponentHolder {
2021-08-10 07:04:44 +02:00
}
}
- if (player != null && amount != 0) {
- CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(player, this, this.getDamageValue() + amount);
+ if (player instanceof ServerPlayer serverPlayer && amount != 0) { // Paper - Add EntityDamageItemEvent
+ CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(serverPlayer, this, this.getDamageValue() + amount); // Paper - Add EntityDamageItemEvent
2021-08-10 07:04:44 +02:00
}
j = this.getDamageValue() + amount;
2024-04-25 05:14:51 +02:00
@@ -717,7 +725,7 @@ public final class ItemStack implements DataComponentHolder {
2024-04-24 17:27:28 +02:00
entityplayer = null;
}
- this.hurtAndBreak(amount, randomsource, entityplayer, () -> {
+ this.hurtAndBreak(amount, randomsource, entity, () -> { // Paper - Add EntityDamageItemEvent
entity.broadcastBreakEvent(slot);
Item item = this.getItem();
// CraftBukkit start - Check for item breaking