Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
2fa8efce9b
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 82af5dc6 SPIGOT-7396: Add PlayerSignOpenEvent 3f0281ca SPIGOT-7063, PR-763: Add DragonBattle#initiateRespawn with custom EnderCrystals f83c8df4 PR-873: Add PlayerRecipeBookClickEvent 14560d39 SPIGOT-7435: Add TeleportCause#EXIT_BED 2cc6db92 SPIGOT-7422, PR-887: Add API to set sherds on decorated pots 36022f02 PR-883: Add ItemFactory#getSpawnEgg 12eb5c46 PR-881: Update Scoreboard Javadocs, remove explicit exception throwing f6d8d44a PR-882: Add modern time API methods to ban API 21a7b710 Upgrade some Maven plugins to reduce warnings 11fd1225 PR-886: Deprecate the SmithingRecipe constructor as it now does nothing dbd1761d SPIGOT-7406: Improve documentation for getDragonBattle CraftBukkit Changes: d548daac2 SPIGOT-7446: BlockState#update not updating a spawner's type to null 70e0bc050 SPIGOT-7447: Fix --forceUpgrade 6752f1d63 SPIGOT-7396: Add PlayerSignOpenEvent 847b4cad5 SPIGOT-7063, PR-1071: Add DragonBattle#initiateRespawn with custom EnderCrystals c335a555f PR-1212: Add PlayerRecipeBookClickEvent 4be756ecb SPIGOT-7445: Fix opening smithing inventory db70bd6ed SPIGOT-7441: Fix issue placing certain items in creative/op f7fa6d993 SPIGOT-7435: Add TeleportCause#EXIT_BED b435e8e8d SPIGOT-7349: Player#setDisplayName not working when message/format unmodified a2fafdd1d PR-1232: Re-add fix for player rotation 7cf863de1 PR-1233: Remove some old MC bug fixes now fixed in vanilla 08ec344ad Fix ChunkGenerator#generateCaves never being called 5daeb502a SPIGOT-7422, PR-1228: Add API to set sherds on decorated pots 52faa6b32 PR-1224: Add ItemFactory#getSpawnEgg 01cae71b7 SPIGOT-7429: Fix LEFT_CLICK_AIR not working for passable entities and spectators a94277a18 PR-1223: Remove non-existent scoreboard display name/prefix/suffix limits 36b107660 PR-1225: Add modern time API methods to ban API 59ead25bc Upgrade some Maven plugins to reduce warnings 202fc5c4e Increase outdated build delay ce545de57 SPIGOT-7398: TextDisplay#setInterpolationDuration incorrectly updates the line width Spigot Changes: b41c46db Rebuild patches 3374045a SPIGOT-7431: Fix EntityMountEvent returning opposite entities 0ca4eb66 Rebuild patches
53 Zeilen
2.1 KiB
Diff
53 Zeilen
2.1 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:21:19 +0100
|
|
Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
|
|
index 2d049633998b3965ce0f4a6a4cea3169da0d5658..a2993c7434c9775483a1b4628f2f66454b0d666d 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
|
|
@@ -15,12 +15,21 @@ public class PlayerItemDamageEvent extends PlayerEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private final ItemStack item;
|
|
private int damage;
|
|
+ private int originalDamage; // Paper - Add pre-reduction damage
|
|
private boolean cancelled = false;
|
|
|
|
+ @Deprecated // Paper - Add pre-reduction damage
|
|
public PlayerItemDamageEvent(@NotNull Player player, @NotNull ItemStack what, int damage) {
|
|
+ // Paper start - Add pre-reduction damage
|
|
+ this(player, what, damage, damage);
|
|
+ }
|
|
+
|
|
+ public PlayerItemDamageEvent(@NotNull Player player, @NotNull ItemStack what, int damage, int originalDamage) {
|
|
super(player);
|
|
this.item = what;
|
|
this.damage = damage;
|
|
+ this.originalDamage = originalDamage;
|
|
+ // Paper end
|
|
}
|
|
|
|
/**
|
|
@@ -42,6 +51,19 @@ public class PlayerItemDamageEvent extends PlayerEvent implements Cancellable {
|
|
return damage;
|
|
}
|
|
|
|
+ // Paper start - Add pre-reduction damage
|
|
+ /**
|
|
+ * Gets the amount of durability damage this item would have taken before
|
|
+ * the Unbreaking reduction. If the item has no Unbreaking level then
|
|
+ * this value will be the same as the {@link #getDamage()} value.
|
|
+ *
|
|
+ * @return pre-reduction damage amount
|
|
+ */
|
|
+ public int getOriginalDamage() {
|
|
+ return originalDamage;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public void setDamage(int damage) {
|
|
this.damage = damage;
|
|
}
|