Fix elytra durability setting not working properly (#1589)

This commit is contained in:
Pantera (Mad_Daniel)
2024-09-16 00:45:43 +09:00
committed by GitHub
parent fdfc12e8c7
commit bc7bcbb8dd
2 changed files with 19 additions and 2 deletions

View File

@@ -45,6 +45,23 @@ index 218f2f085309f04438f8b07bc41cf242583db2dc..ea8e49b42b9dde74784189430be66ed6
if (event.shouldConsume() && !user.hasInfiniteMaterials()) {
itemStack.shrink(1);
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index e90cf9da9c35c5b73b489990141311c283db4767..59b54a0c37a435976f92a57f5838e25c87096213 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -723,6 +723,12 @@ public final class ItemStack implements DataComponentHolder {
this.setDamageValue(j);
if (j >= this.getMaxDamage()) {
Item item = this.getItem();
+ // Purpur start
+ if (item == Items.ELYTRA) {
+ setDamageValue(this.getMaxDamage() - 1);
+ return;
+ }
+ // Purpur end
this.shrink(1);
breakCallback.accept(item);
diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
index f1b2d388a1a40a1d909a2e726f32d6c15e1eb0eb..4934bae61114b49a9f8d0ed044fbb881210df32a 100644
--- a/src/main/java/net/minecraft/world/item/TridentItem.java