2022-04-18 09:51:45 +00:00
|
|
|
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] Add pre-unbreaking amount to PlayerItemDamageEvent
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2022-07-27 21:50:05 +00:00
|
|
|
index 67626e7faa4d0854d31b41c0a702edbeb6ce4270..c18a0bc94d0210396046f4475e49a739088593f3 100644
|
2022-04-18 09:51:45 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2022-06-08 13:59:48 +00:00
|
|
|
@@ -563,10 +563,11 @@ public final class ItemStack {
|
2022-04-18 09:51:45 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ int originalDamage = amount; // Paper
|
|
|
|
|
amount -= k;
|
|
|
|
|
// CraftBukkit start
|
|
|
|
|
if (player instanceof ServerPlayer serverPlayer) { // Paper
|
|
|
|
|
- PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); // Paper
|
|
|
|
|
+ PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount, originalDamage); // Paper
|
|
|
|
|
event.getPlayer().getServer().getPluginManager().callEvent(event);
|
|
|
|
|
|
|
|
|
|
if (amount != event.getDamage() || event.isCancelled()) {
|
