PaperMC/patches/unapplied/server/0691-Expand-PlayerItemDamageEvent.patch

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 ec3be7fb4eb4560fe0106ac127f17d7437612157..bee59df6a8f30416f94c1a4fbd5e2629336e842f 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()) {
788/1053 2024-06-14 03:30:23 +02: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] Expand PlayerItemDamageEvent`


			`diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java`
Remove wall-time / unused skip tick protection (#11412) Spigot still maintains some partial implementation of "tick skipping", a practice in which the MinecraftServer.currentTick field is updated not by an increment of one per actual tick, but instead set to System.currentTimeMillis() / 50. This behaviour means that the tracked tick may "skip" a tick value in case a previous tick took more than the expected 50ms. To compensate for this in important paths, spigot/craftbukkit implements "wall-time". Instead of incrementing/decrementing ticks on block entities/entities by one for each call to their tick() method, they instead increment/decrement important values, like an ItemEntity's age or pickupDelay, by the difference of `currentTick - lastTick`, where `lastTick` is the value of `currentTick` during the last tick() call. These "fixes" however do not play nicely with minecraft's simulation distance as entities/block entities implementing the above behaviour would "catch up" their values when moving from a non-ticking chunk to a ticking one as their `lastTick` value remains stuck on the last tick in a ticking chunk and hence lead to a large "catch up" once ticked again. Paper completely removes the "tick skipping" behaviour (See patch "Further-improve-server-tick-loop"), making the above precautions completely unnecessary, which also rids paper of the previous described incompatibility with non-ticking chunks. 2024-09-19 16:36:07 +02:00			`index ec3be7fb4eb4560fe0106ac127f17d7437612157..bee59df6a8f30416f94c1a4fbd5e2629336e842f 100644`
788/1053 2024-06-14 03:30:23 +02:00			`--- 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()) {`