mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 17:31:06 +01:00
24 lines
1.4 KiB
Diff
24 lines
1.4 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] 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
|
||
|
|
index dc4639f905fb71435daf29c61f64621a3e2cc533..6837c965592d4584cfc958a1008b98791a0fc780 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
@@ -551,10 +551,11 @@ public final class ItemStack {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ 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()) {
|