aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0493-living-entity-allow-attribute-registration.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0493-living-entity-allow-attribute-registration.patch')
-rw-r--r--patches/server/0493-living-entity-allow-attribute-registration.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/patches/server/0493-living-entity-allow-attribute-registration.patch b/patches/server/0493-living-entity-allow-attribute-registration.patch
new file mode 100644
index 0000000000..586ae419e6
--- /dev/null
+++ b/patches/server/0493-living-entity-allow-attribute-registration.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ysl3000 <[email protected]>
+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
+index cd03d705337a0ea34c7c06a581294112433afb50..69992ebc999ea3ff9e47e4e049bcc514c01150ca 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
++++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+@@ -140,4 +140,12 @@ public class AttributeMap {
+ }
+ }
+ }
++
++ // Paper - start - living entity allow attribute registration
++ public void registerAttribute(Holder<Attribute> attributeBase) {
++ AttributeInstance attributeModifiable = new AttributeInstance(attributeBase, AttributeInstance::getAttribute);
++ attributes.put(attributeBase, attributeModifiable);
++ }
++ // Paper - end - living entity allow attribute registration
++
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
+index 5678d2007d5adf45dec0638c5dd848b601801814..0a7ed5a4f1644a70d8f98ad7a6962b814ad6daf4 100644
+--- 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 {
+
+ return (nms == null) ? null : new CraftAttributeInstance(nms, attribute);
+ }
++ // Paper start - living entity allow attribute registration
++ @Override
++ public void registerAttribute(Attribute attribute) {
++ Preconditions.checkArgument(attribute != null, "attribute");
++ handle.registerAttribute(CraftAttribute.bukkitToMinecraftHolder(attribute));
++ }
++ // Paper end - living entity allow attribute registration
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index 498d5097597a35827f4293b303a956fcf63bb52d..e03a8bbd13da81644d9f302724c27705d812a10f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -757,6 +757,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+ return this.getHandle().craftAttributes.getAttribute(attribute);
+ }
+
++ // Paper start - living entity allow attribute registration
++ @Override
++ public void registerAttribute(Attribute attribute) {
++ getHandle().craftAttributes.registerAttribute(attribute);
++ }
++ // Paper end - living entity allow attribute registration
++
+ @Override
+ public void setAI(boolean ai) {
+ if (this.getHandle() instanceof Mob) {