Paper/patches/server/0500-living-entity-allow-attribute-registration.patch

58 lines
2.9 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: ysl3000 <yannicklamprecht@live.de>
Date: Sat, 24 Oct 2020 16:37:44 +0200
Subject: [PATCH] living entity allow attribute registration
diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
2024-04-26 06:27:19 +02:00
index f03f40e2624d0e8e27a6fb7ae33d82cb614252f4..9ef8f014af332da129bfcd3370da983ec035ecc6 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
2024-04-24 15:46:45 +02:00
@@ -106,4 +106,12 @@ public class AttributeMap {
}
2021-06-11 14:02:28 +02:00
}
}
+
+ // Paper - start - living entity allow attribute registration
2024-04-26 06:27:19 +02:00
+ public void registerAttribute(Holder<Attribute> attributeBase) {
2021-06-11 14:02:28 +02:00
+ AttributeInstance attributeModifiable = new AttributeInstance(attributeBase, AttributeInstance::getAttribute);
2021-06-15 04:59:31 +02:00
+ attributes.put(attributeBase, attributeModifiable);
2021-06-11 14:02:28 +02:00
+ }
+ // Paper - end - living entity allow attribute registration
2021-06-11 14:02:28 +02:00
+
}
diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
2024-04-26 06:27:19 +02:00
index a0a34f680e21007ebf2c2497d2e6505eedae6481..485b4d5a0ae9d8ac528749e87b4b2833732120a8 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
+++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
@@ -35,4 +35,11 @@ public class CraftAttributeMap implements Attributable {
2021-06-11 14:02:28 +02:00
return (nms == null) ? null : new CraftAttributeInstance(nms, attribute);
}
+ // Paper start - living entity allow attribute registration
2021-06-11 14:02:28 +02:00
+ @Override
+ public void registerAttribute(Attribute attribute) {
+ Preconditions.checkArgument(attribute != null, "attribute");
2024-04-26 06:27:19 +02:00
+ handle.registerAttribute(CraftAttribute.bukkitToMinecraftHolder(attribute));
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end - living entity allow attribute registration
}
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
2024-04-24 15:46:45 +02:00
index b88077ac1ed99057b8a9361ea550cd2b00040f88..2701e53086f4be07c341cd1e4fcd7a351e77c486 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
2024-04-24 15:46:45 +02:00
@@ -754,6 +754,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
2021-06-15 04:59:31 +02:00
return this.getHandle().craftAttributes.getAttribute(attribute);
2021-06-11 14:02:28 +02:00
}
+ // Paper start - living entity allow attribute registration
2021-06-11 14:02:28 +02:00
+ @Override
+ public void registerAttribute(Attribute attribute) {
+ getHandle().craftAttributes.registerAttribute(attribute);
+ }
+ // Paper end - living entity allow attribute registration
2021-06-11 14:02:28 +02:00
+
@Override
public void setAI(boolean ai) {
if (this.getHandle() instanceof Mob) {