aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0606-Add-EntityDamageItemEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0606-Add-EntityDamageItemEvent.patch')
-rw-r--r--patches/server/0606-Add-EntityDamageItemEvent.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/patches/server/0606-Add-EntityDamageItemEvent.patch b/patches/server/0606-Add-EntityDamageItemEvent.patch
new file mode 100644
index 0000000000..99df36aea0
--- /dev/null
+++ b/patches/server/0606-Add-EntityDamageItemEvent.patch
@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Tue, 22 Dec 2020 13:52:48 -0800
+Subject: [PATCH] Add EntityDamageItemEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+index 9d2d305a5e66b9f3d94f6464736f5bb40adae591..d5ee83e6538fbd067388272fa9895e17859be642 100644
+--- a/src/main/java/net/minecraft/world/item/ItemStack.java
++++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+@@ -624,7 +624,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 - Add EntityDamageItemEvent
+ if (!this.isDamageableItem()) {
+ return false;
+ } else {
+@@ -642,8 +642,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 - Add EntityDamageItemEvent
++ PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); // Paper - Add EntityDamageItemEvent
+ event.getPlayer().getServer().getPluginManager().callEvent(event);
+
+ if (amount != event.getDamage() || event.isCancelled()) {
+@@ -654,6 +654,14 @@ public final class ItemStack {
+ }
+
+ amount = event.getDamage();
++ // Paper start - Add 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 - Add EntityDamageItemEvent
+ }
+ // CraftBukkit end
+ if (amount <= 0) {
+@@ -661,8 +669,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 - Add EntityDamageItemEvent
++ CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(serverPlayer, this, this.getDamageValue() + amount); // Paper - Add EntityDamageItemEvent
+ }
+
+ j = this.getDamageValue() + amount;
+@@ -674,7 +682,7 @@ public final class ItemStack {
+ public <T extends LivingEntity> void hurtAndBreak(int amount, T entity, Consumer<T> 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 - Add EntityDamageItemEvent
+ breakCallback.accept(entity);
+ Item item = this.getItem();
+ // CraftBukkit start - Check for item breaking