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-24 15:46:45 +02:00
|
|
|
index f03f40e2624d0e8e27a6fb7ae33d82cb614252f4..b02c8514aac174db1c04a6c8240851eff474906f 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
|
|
|
}
|
|
|
|
}
|
|
|
|
+
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper - start - living entity allow attribute registration
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public void registerAttribute(Attribute attributeBase) {
|
|
|
|
+ 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
|
|
|
+ }
|
2024-01-19 22:13:42 +01: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-24 15:46:45 +02:00
|
|
|
index a0a34f680e21007ebf2c2497d2e6505eedae6481..5314905063e62f0f5ed56e476718ba7610bb711f 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
|
2023-09-23 04:06:03 +02:00
|
|
|
@@ -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);
|
|
|
|
}
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // 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");
|
2023-09-23 04:06:03 +02:00
|
|
|
+ handle.registerAttribute(CraftAttribute.bukkitToMinecraft(attribute));
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - living entity allow attribute registration
|
2023-09-23 04:06:03 +02:00
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
2024-01-19 22:13:42 +01: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);
|
|
|
|
+ }
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // 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) {
|