dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
106 Zeilen
5.4 KiB
Diff
106 Zeilen
5.4 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:45 -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
|
|
|
|
== AT ==
|
|
public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
index d825c2e3808e44db9935dab4e7b528146c6d83c2..96a7e80e3efab1bf626fb7aff61e095ca09789d4 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
@@ -647,8 +647,13 @@ public final class ItemStack implements DataComponentHolder {
|
|
}
|
|
|
|
public void hurtAndBreak(int amount, ServerLevel world, @Nullable LivingEntity player, Consumer<Item> breakCallback) { // Paper - Add EntityDamageItemEvent
|
|
+ // Paper start - add param to skip infinite mats check
|
|
+ this.hurtAndBreak(amount, world, player, breakCallback, false);
|
|
+ }
|
|
+ public void hurtAndBreak(int amount, ServerLevel world, @Nullable LivingEntity player, Consumer<Item> breakCallback, boolean force) {
|
|
+ // Paper end - add param to skip infinite mats check
|
|
if (this.isDamageableItem()) {
|
|
- if (player == null || !player.hasInfiniteMaterials()) {
|
|
+ if (player == null || !player.hasInfiniteMaterials() || force) { // Paper
|
|
if (amount > 0) {
|
|
int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent
|
|
amount = EnchantmentHelper.processDurabilityChange(world, this, amount);
|
|
@@ -699,6 +704,11 @@ public final class ItemStack implements DataComponentHolder {
|
|
}
|
|
|
|
public void hurtAndBreak(int amount, LivingEntity entity, EquipmentSlot slot) {
|
|
+ // Paper start - add param to skip infinite mats check
|
|
+ this.hurtAndBreak(amount, entity, slot, false);
|
|
+ }
|
|
+ public void hurtAndBreak(int amount, LivingEntity entity, EquipmentSlot slot, boolean force) {
|
|
+ // Paper end - add param to skip infinite mats check
|
|
Level world = entity.level();
|
|
|
|
if (world instanceof ServerLevel worldserver) {
|
|
@@ -717,7 +727,7 @@ public final class ItemStack implements DataComponentHolder {
|
|
}
|
|
// CraftBukkit end
|
|
entity.onEquippedItemBroken(item, slot);
|
|
- });
|
|
+ }, force); // Paper
|
|
}
|
|
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index af1aa0a488fba542954b5d86b19e96e74e458e31..557628f9a2868788e7b265445b01a38f6fd99a31 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -1105,4 +1105,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
this.getHandle().knockback(strength, directionX, directionZ);
|
|
};
|
|
// Paper end - knockback API
|
|
+
|
|
+ // Paper start - ItemStack damage API
|
|
+ public void broadcastSlotBreak(final org.bukkit.inventory.EquipmentSlot slot) {
|
|
+ this.getHandle().level().broadcastEntityEvent(this.getHandle(), net.minecraft.world.entity.LivingEntity.entityEventForEquipmentBreak(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot)));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void broadcastSlotBreak(final org.bukkit.inventory.EquipmentSlot slot, final Collection<org.bukkit.entity.Player> players) {
|
|
+ if (players.isEmpty()) {
|
|
+ return;
|
|
+ }
|
|
+ final net.minecraft.network.protocol.game.ClientboundEntityEventPacket packet = new net.minecraft.network.protocol.game.ClientboundEntityEventPacket(
|
|
+ this.getHandle(),
|
|
+ net.minecraft.world.entity.LivingEntity.entityEventForEquipmentBreak(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot))
|
|
+ );
|
|
+ players.forEach(player -> ((CraftPlayer) player).getHandle().connection.send(packet));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public ItemStack damageItemStack(ItemStack stack, final int amount) {
|
|
+ final net.minecraft.world.item.ItemStack nmsStack;
|
|
+ if (stack instanceof final CraftItemStack craftItemStack) {
|
|
+ if (craftItemStack.handle == null || craftItemStack.handle.isEmpty()) {
|
|
+ return stack;
|
|
+ }
|
|
+ nmsStack = craftItemStack.handle;
|
|
+ } else {
|
|
+ nmsStack = CraftItemStack.asNMSCopy(stack);
|
|
+ stack = CraftItemStack.asCraftMirror(nmsStack); // mirror to capture changes in hurt logic & events
|
|
+ }
|
|
+ this.damageItemStack0(nmsStack, amount, null);
|
|
+ return stack;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void damageItemStack(final org.bukkit.inventory.EquipmentSlot slot, final int amount) {
|
|
+ final net.minecraft.world.entity.EquipmentSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
|
|
+ this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
|
|
+ }
|
|
+
|
|
+ private void damageItemStack0(final net.minecraft.world.item.ItemStack nmsStack, final int amount, final net.minecraft.world.entity.EquipmentSlot slot) {
|
|
+ nmsStack.hurtAndBreak(amount, this.getHandle(), slot, true);
|
|
+ }
|
|
+ // Paper end - ItemStack damage API
|
|
}
|