2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								From: Jake Potrebic <jake.m.potrebic@gmail.com>
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								Date: Fri, 20 Aug 2021 13:03:21 -0700
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								Subject: [PATCH] Get entity default attributes
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
									
										
										
										
											2022-11-19 15:53:20 -08:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								== AT ==
  
						 
					
						
							
								
									
										
										
										
											2024-04-25 21:27:19 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								public net.minecraft.world.entity.ai.attributes.AttributeSupplier getAttributeInstance(Lnet/minecraft/core/Holder;)Lnet/minecraft/world/entity/ai/attributes/AttributeInstance;
							 
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								diff --git a/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								new file mode 100644
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								index 0000000000000000000000000000000000000000..12135ffeacd648f6bc4d7d327059ea1a7e8c79c4
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								--- /dev/null
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								@@ -0,0 +1,30 @@
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+package io.papermc.paper.attribute;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.Attribute;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.AttributeModifier;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.craftbukkit.attribute.CraftAttributeInstance;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import java.util.Collection;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+public class UnmodifiableAttributeInstance extends CraftAttributeInstance {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public UnmodifiableAttributeInstance(AttributeInstance handle, Attribute attribute) {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        super(handle, attribute);
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public void setBaseValue(double d) {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        throw new UnsupportedOperationException("Cannot modify default attributes");
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public void addModifier(AttributeModifier modifier) {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        throw new UnsupportedOperationException("Cannot modify default attributes");
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public void removeModifier(AttributeModifier modifier) {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        throw new UnsupportedOperationException("Cannot modify default attributes");
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+}
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								diff --git a/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeMap.java b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeMap.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								new file mode 100644
							 
						 
					
						
							
								
									
										
										
										
											2024-04-25 21:27:19 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								index 0000000000000000000000000000000000000000..ec9ebd2d539333293c51b7edfa18f18b066d7e43
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								--- /dev/null
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeMap.java
  
						 
					
						
							
								
									
										
										
										
											2022-11-19 15:53:20 -08:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -0,0 +1,32 @@
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+package io.papermc.paper.attribute;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.Attributable;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.Attribute;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.AttributeInstance;
  
						 
					
						
							
								
									
										
										
										
											2023-09-23 12:06:03 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+import org.bukkit.craftbukkit.attribute.CraftAttribute;
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+import org.jetbrains.annotations.NotNull;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.jetbrains.annotations.Nullable;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+public class UnmodifiableAttributeMap implements Attributable {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    private final AttributeSupplier handle;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public UnmodifiableAttributeMap(@NotNull AttributeSupplier handle) {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        this.handle = handle;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public @Nullable AttributeInstance getAttribute(@NotNull Attribute attribute) {
  
						 
					
						
							
								
									
										
										
										
											2024-04-25 21:27:19 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+        net.minecraft.core.Holder<net.minecraft.world.entity.ai.attributes.Attribute> nmsAttribute = CraftAttribute.bukkitToMinecraftHolder(attribute);
  
						 
					
						
							
								
									
										
										
										
											2022-11-19 15:53:20 -08:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+        if (!this.handle.hasAttribute(nmsAttribute)) {
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+            return null;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        }
  
						 
					
						
							
								
									
										
										
										
											2022-11-19 15:53:20 -08:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+        return new UnmodifiableAttributeInstance(this.handle.getAttributeInstance(nmsAttribute), attribute);
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public void registerAttribute(@NotNull Attribute attribute) {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        throw new UnsupportedOperationException("Cannot register new attributes here");
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+}
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
  
						 
					
						
							
								
									
										
										
										
											2024-06-13 17:08:12 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								index a867c9de9c2c1798d8e9014f5114b0f4e32b3261..cfd003e975573564a3fea9d4379842979711e841 100644
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
  
						 
					
						
							
								
									
										
										
										
											2024-06-13 16:45:27 +02:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -555,6 +555,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
						 
					
						
							
								
									
										
										
										
											2024-04-26 16:43:59 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								         }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								         return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
							 
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								     }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public boolean hasDefaultEntityAttributes(NamespacedKey bukkitEntityKey) {
  
						 
					
						
							
								
									
										
										
										
											2022-12-07 20:24:00 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+        return net.minecraft.world.entity.ai.attributes.DefaultAttributes.hasSupplier(net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public org.bukkit.attribute.Attributable getDefaultEntityAttributes(NamespacedKey bukkitEntityKey) {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        Preconditions.checkArgument(hasDefaultEntityAttributes(bukkitEntityKey), bukkitEntityKey + " doesn't have default attributes");
  
						 
					
						
							
								
									
										
										
										
											2022-12-07 20:24:00 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+        var supplier = net.minecraft.world.entity.ai.attributes.DefaultAttributes.getSupplier((net.minecraft.world.entity.EntityType<? extends net.minecraft.world.entity.LivingEntity>) net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+        return new io.papermc.paper.attribute.UnmodifiableAttributeMap(supplier);
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     // Paper end
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2024-05-11 14:48:37 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								     @Override
							 
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								diff --git a/src/test/java/io/papermc/paper/attribute/EntityTypeAttributesTest.java b/src/test/java/io/papermc/paper/attribute/EntityTypeAttributesTest.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								new file mode 100644
							 
						 
					
						
							
								
									
										
										
										
											2023-09-24 17:16:58 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								index 0000000000000000000000000000000000000000..e8cdfa385230d3de202122e4df5e07f61f80ce75
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								--- /dev/null
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/src/test/java/io/papermc/paper/attribute/EntityTypeAttributesTest.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								@@ -0,0 +1,39 @@
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+package io.papermc.paper.attribute;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.Attributable;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.Attribute;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.AttributeInstance;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.attribute.AttributeModifier;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.entity.EntityType;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.support.AbstractTestingBase;
  
						 
					
						
							
								
									
										
										
										
											2023-09-24 17:16:58 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+import org.junit.jupiter.api.Test;
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
									
										
										
										
											2023-09-24 17:16:58 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+import static org.junit.jupiter.api.Assertions.assertFalse;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import static org.junit.jupiter.api.Assertions.assertNotNull;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import static org.junit.jupiter.api.Assertions.assertThrows;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import static org.junit.jupiter.api.Assertions.assertTrue;
  
						 
					
						
							
								
									
										
										
										
											2021-10-19 18:55:05 -07:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+public class EntityTypeAttributesTest extends AbstractTestingBase {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Test
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public void testIllegalEntity() {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        assertFalse(EntityType.EGG.hasDefaultAttributes());
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        assertThrows(IllegalArgumentException.class, () -> EntityType.EGG.getDefaultAttributes());
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Test
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public void testLegalEntity() {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        assertTrue(EntityType.ZOMBIE.hasDefaultAttributes());
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        EntityType.ZOMBIE.getDefaultAttributes();
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    @Test
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public void testUnmodifiabilityOfAttributable() {
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        Attributable attributable = EntityType.ZOMBIE.getDefaultAttributes();
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        assertThrows(UnsupportedOperationException.class, () -> attributable.registerAttribute(Attribute.GENERIC_ATTACK_DAMAGE));
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        AttributeInstance instance = attributable.getAttribute(Attribute.GENERIC_FOLLOW_RANGE);
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        assertNotNull(instance);
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        assertThrows(UnsupportedOperationException.class, () -> instance.addModifier(new AttributeModifier("test", 3, AttributeModifier.Operation.ADD_NUMBER)));
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        assertThrows(UnsupportedOperationException.class, () -> instance.setBaseValue(3.2));
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+}