1 files changed, 92 insertions, 0 deletions
diff --git a/patches/server/0544-Improve-item-default-attribute-API.patch b/patches/server/0544-Improve-item-default-attribute-API.patch
new file mode 100644
index 0000000000..cce3124b76
--- /dev/null
+++ b/patches/server/0544-Improve-item-default-attribute-API.patch
@@ -0,0 +1,92 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 8 May 2021 15:01:54 -0700
+Subject: [PATCH] Improve item default attribute API
+
+Also fixes an issue where upstream isn't
+actually getting the correct default attributes
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
+index de0eba19c0c963adb4f17cea22333240021fd801..3b171a08bd0bedfe224905feb5838d2540199bce 100644
+--- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
++++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
+@@ -75,7 +75,7 @@ public class CraftAttributeInstance implements AttributeInstance {
+         return new AttributeModifier(CraftNamespacedKey.fromMinecraft(nms.id()), nms.amount(), AttributeModifier.Operation.values()[nms.operation().ordinal()], org.bukkit.inventory.EquipmentSlotGroup.ANY);
+     }
+ 
+-    public static AttributeModifier convert(net.minecraft.world.entity.ai.attributes.AttributeModifier nms, EquipmentSlot slot) {
+-        return new AttributeModifier(CraftNamespacedKey.fromMinecraft(nms.id()), nms.amount(), AttributeModifier.Operation.values()[nms.operation().ordinal()], slot.getGroup());
++    public static AttributeModifier convert(net.minecraft.world.entity.ai.attributes.AttributeModifier nms, net.minecraft.world.entity.EquipmentSlotGroup slot) { // Paper
++        return new AttributeModifier(CraftNamespacedKey.fromMinecraft(nms.id()), nms.amount(), AttributeModifier.Operation.values()[nms.operation().ordinal()], org.bukkit.craftbukkit.CraftEquipmentSlot.getSlot(slot)); // Paper
+     }
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
+index 761d943658de9c7faadf24584baf63057e99d04a..c0ef1c99fa384fa4f898ef020ec16060a7675e84 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
+@@ -198,15 +198,34 @@ public class CraftItemType<M extends ItemMeta> implements ItemType.Typed<M>, Han
+ //        return CraftEquipmentSlot.getSlot(EntityInsentient.getEquipmentSlotForItem(CraftItemStack.asNMSCopy(ItemStack.of(this))));
+ //    }
+ 
++    // Paper start - improve default attribute API
++    @Override
++    public @NotNull Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers() {
++        return this.getDefaultAttributeModifiers(sg -> true);
++    }
++    // Paper end - improve default attribute API
++
+     @Override
+     public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot slot) {
+-        ImmutableMultimap.Builder<Attribute, AttributeModifier> defaultAttributes = ImmutableMultimap.builder();
++        // Paper start - improve/fix item default attribute API
++        final net.minecraft.world.entity.EquipmentSlot nmsSlot = CraftEquipmentSlot.getNMS(slot);
++        return this.getDefaultAttributeModifiers(sg -> sg.test(nmsSlot));
++    }
+ 
+-        ItemAttributeModifiers nmsDefaultAttributes = this.item.getDefaultAttributeModifiers();
+-        nmsDefaultAttributes.forEach(CraftEquipmentSlot.getNMS(slot), (key, value) -> {
+-            Attribute attribute = CraftAttribute.minecraftToBukkit(key.value());
+-            defaultAttributes.put(attribute, CraftAttributeInstance.convert(value, slot));
+-        });
++    private Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(final java.util.function.Predicate<net.minecraft.world.entity.EquipmentSlotGroup> slotPredicate) {
++        final ImmutableMultimap.Builder<Attribute, AttributeModifier> defaultAttributes = ImmutableMultimap.builder();
++        ItemAttributeModifiers nmsDefaultAttributes = this.item.components().getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
++        if (nmsDefaultAttributes.modifiers().isEmpty()) {
++            // we have to check both places cause for some reason vanilla puts default modifiers for armor in a different place
++            nmsDefaultAttributes = this.item.getDefaultAttributeModifiers();
++        }
++        for (final net.minecraft.world.item.component.ItemAttributeModifiers.Entry entry : nmsDefaultAttributes.modifiers()) {
++            if (!slotPredicate.test(entry.slot())) continue;
++            final Attribute attribute = CraftAttribute.minecraftHolderToBukkit(entry.attribute());
++            final AttributeModifier modifier = CraftAttributeInstance.convert(entry.modifier(), entry.slot());
++            defaultAttributes.put(attribute, modifier);
++        }
++        // Paper end - improve/fix item default attribute API
+ 
+         return defaultAttributes.build();
+     }
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+index 080ab25d3585552c1abd62a9992d48bf094fc065..a867c9de9c2c1798d8e9014f5114b0f4e32b3261 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+@@ -400,15 +400,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+ 
+     @Override
+     public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(Material material, EquipmentSlot slot) {
+-        ImmutableMultimap.Builder<Attribute, AttributeModifier> defaultAttributes = ImmutableMultimap.builder();
+-
+-        ItemAttributeModifiers nmsDefaultAttributes = CraftMagicNumbers.getItem(material).getDefaultAttributeModifiers();
+-        nmsDefaultAttributes.forEach(CraftEquipmentSlot.getNMS(slot), (key, value) -> {
+-            Attribute attribute = CraftAttribute.minecraftToBukkit(key.value());
+-            defaultAttributes.put(attribute, CraftAttributeInstance.convert(value, slot));
+-        });
+-
+-        return defaultAttributes.build();
++        // Paper start - delegate to method on ItemType
++        final org.bukkit.inventory.ItemType item = material.asItemType();
++        Preconditions.checkArgument(item != null, material + " is not an item and does not have default attributes");
++        return item.getDefaultAttributeModifiers(slot);
++        // Paper end - delegate to method on ItemType
+     }
+ 
+     @Override