geforkt von Mirrors/Paper
e035fd7034
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: cc9aa21a SPIGOT-6399, SPIGOT-7344: Clarify collidable behavior for player entities f23325b6 Add API for per-world simulation distances 26e1774e Add API for per-world view distances 0b541e60 Add PlayerLoginEvent#getRealAddress 5f027d2d PR-949: Add Vector#fromJOML() overloads for read-only vector types CraftBukkit Changes: bcf56171a PR-1321: Clean up some stuff which got missed during previous PRs 7f833a2d1 SPIGOT-7462: Players no longer drop XP after dying near a Sculk Catalyst 752aac669 Implement APIs for per world view and simulation distances 57d7ef433 Preserve empty enchantment tags for glow effect 465ec3fb4 Remove connected check on setScoreboard f90ce621e Use one PermissibleBase for all command blocks 5876cca44 SPIGOT-7550: Fix creation of Arrow instances f03fc3aa3 SPIGOT-7549: ServerTickManager#setTickRate incorrect Precondition 9d7f49b01 SPIGOT-7548: Fix wrong spawn location for experience orb and dropped item Spigot Changes: ed9ba9a4 Drop no longer required patch ignoring -o option 86b5dd6a SPIGOT-7546: Fix hardcoded check for outdated client message aa7cde7a Remove obsolete APIs for per world view and simulation distances 6dff577e Remove obsolete patch preserving empty `ench` tags a3bf95b8 Remove obsolete PlayerLoginEvent#getRealAddress 1b02f5d6 Remove obsolete connected check on setScoreboard patch acf717eb Remove obsolete command block PermissibleBase patch 053fa2a9 Remove redundant patch dealing with null tile entities
91 Zeilen
3.9 KiB
Diff
91 Zeilen
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 8 May 2022 13:35:58 -0700
|
|
Subject: [PATCH] ItemStack damage API
|
|
|
|
Adds methods notify clients about item breaks and
|
|
to simulate damage done to an itemstack and all
|
|
the logic associated with damaging them
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 98956d13ac767cca447f53c10f1b1fedafad7fbf..c0e31ebbb41bd3013fe4a1609dd9af754434736d 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -1197,5 +1197,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* @param directionZ The relative z position of the knockback source direction
|
|
*/
|
|
void knockback(double strength, double directionX, double directionZ);
|
|
+
|
|
+ /**
|
|
+ * Notifies all clients tracking this entity that the item in
|
|
+ * the slot of this entity broke.
|
|
+ * <p>
|
|
+ * NOTE: this does not mutate any entity state
|
|
+ *
|
|
+ * @param slot the slot
|
|
+ */
|
|
+ void broadcastSlotBreak(org.bukkit.inventory.@NotNull EquipmentSlot slot);
|
|
+
|
|
+ /**
|
|
+ * Notifies specified players that the item in the slot
|
|
+ * of this entity broke.
|
|
+ * <p>
|
|
+ * NOTE: this does not mutate any entity state
|
|
+ *
|
|
+ * @param slot the slot
|
|
+ * @param players the players to notify
|
|
+ */
|
|
+ void broadcastSlotBreak(org.bukkit.inventory.@NotNull EquipmentSlot slot, @NotNull Collection<Player> players);
|
|
+
|
|
+ /**
|
|
+ * Damages the itemstack in this slot by the specified amount.
|
|
+ * <p>
|
|
+ * This runs all logic associated with damaging an itemstack like
|
|
+ * gamemode and enchantment checks, events, stat changes, and advancement
|
|
+ * triggers.
|
|
+ *
|
|
+ * @param stack the itemstack to damage
|
|
+ * @param amount the amount of damage to do
|
|
+ * @return the damaged itemstack, or an empty stack if it broke. There are no
|
|
+ * guarantees the returned itemstack is the same instance
|
|
+ */
|
|
+ @NotNull ItemStack damageItemStack(@NotNull ItemStack stack, int amount);
|
|
+
|
|
+ /**
|
|
+ * Damages the itemstack in this slot by the specified amount.
|
|
+ * <p>
|
|
+ * This runs all logic associated with damaging an itemstack like
|
|
+ * gamemode and enchantment checks, events, stat changes, advancement
|
|
+ * triggers, and notifying clients to play break animations.
|
|
+ *
|
|
+ * @param slot the slot of the stack to damage
|
|
+ * @param amount the amount of damage to do
|
|
+ */
|
|
+ void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
|
|
// Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index eac7adf622b91489711a2f8bcff77fb31292dd67..d15a74c38576c49df61cfab02c70fc5d8c0dd5f7 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -971,5 +971,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
public boolean canRepair(@NotNull ItemStack toBeRepaired) {
|
|
return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Damages this itemstack by the specified amount. This
|
|
+ * runs all logic associated with damaging an itemstack like
|
|
+ * events and stat changes.
|
|
+ *
|
|
+ * @param amount the amount of damage to do
|
|
+ * @param livingEntity the entity related to the damage
|
|
+ * @return the damaged itemstack or an empty one if it broke. May return the same instance of ItemStack
|
|
+ * @see org.bukkit.entity.LivingEntity#damageItemStack(EquipmentSlot, int) to damage itemstacks in equipment slots
|
|
+ */
|
|
+ public @NotNull ItemStack damage(int amount, @NotNull org.bukkit.entity.LivingEntity livingEntity) {
|
|
+ return livingEntity.damageItemStack(this, amount);
|
|
+ }
|
|
// Paper end
|
|
}
|