mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-29 15:07:34 +02:00
2d09115b3a
Uses the new ANSIComponentSerializer introduced in Adventure 4.14.0 to serialize components when logging them via the ComponentLogger, or when sending messages to the console. This replaces the old solution which uses legacy jank and custom color conversions, with a new library that handles the conversion and config
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 6b9924652ef3cb3b26042155b05df3458b2a25ab..ac688d6175cc4c82cb454100b19738318503701a 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
@@ -607,10 +607,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()) {
|