9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-22 08:29:22 +00:00

Update Paper

This commit is contained in:
violetc
2024-06-13 23:13:38 +08:00
parent 2a7fc43064
commit e234432bd9
28 changed files with 98 additions and 103 deletions

View File

@@ -375,10 +375,10 @@ index eb3c12e03c0d5c9cec84d97e2c51c50ce59c23a4..0593d76c67f4475d624c5289b65c5d4a
private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int armorStandId, final String name) {
this.type = type;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index de32eafa4374be8518571950762abc760299adb4..38e05e3ea71300eaeaf4a2a5d5a13121b3f85aee 100644
index 9c7fdcd820fa40aa3f0b8fcebc103cbfe7e27450..8bfbe0b23a1bba49b4c96425dd10eee1153a5697 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3228,7 +3228,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3222,7 +3222,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Nullable
private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
Map<EquipmentSlot, ItemStack> map = null;
@@ -441,10 +441,10 @@ index f38acc96f71298e40ce9433e7759fd223ca55e48..03652ec451109d2026fc313f143d78d4
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index f33088fa895e36dcaf6e96c52aacd5545b657a5a..6e717e2fd606514c8e114babcb083393e00e5fb6 100644
index 0522368deaa13f13fad4e2f00346f3910a064618..99acee6f58ac532694859cf0a71c56f3ef8b402b 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1104,7 +1104,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -1111,7 +1111,7 @@ public final class ItemStack implements DataComponentHolder {
ItemAttributeModifiers itemattributemodifiers = (ItemAttributeModifiers) this.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
if (itemattributemodifiers.showInTooltip()) {