24 Zeilen
1.7 KiB
Diff
24 Zeilen
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
|
||
|
|
Date: Sun, 10 Apr 2022 06:26:32 +0100
|
||
|
|
Subject: [PATCH] Expand PlayerItemDamageEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
index 823146a66de8ce13e6dc6faf2fd135480bd51c3a..d825c2e3808e44db9935dab4e7b528146c6d83c2 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
@@ -650,10 +650,11 @@ public final class ItemStack implements DataComponentHolder {
|
||
|
|
if (this.isDamageableItem()) {
|
||
|
|
if (player == null || !player.hasInfiniteMaterials()) {
|
||
|
|
if (amount > 0) {
|
||
|
|
+ int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent
|
||
|
|
amount = EnchantmentHelper.processDurabilityChange(world, this, amount);
|
||
|
|
// CraftBukkit start
|
||
|
|
if (player instanceof ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
|
||
|
|
- PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); // Paper - Add EntityDamageItemEvent
|
||
|
|
+ PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount, originalDamage); // Paper - Add EntityDamageItemEvent & Expand PlayerItemDamageEvent
|
||
|
|
event.getPlayer().getServer().getPluginManager().callEvent(event);
|
||
|
|
|
||
|
|
if (amount != event.getDamage() || event.isCancelled()) {
|