63 lines
2.8 KiB
Diff
63 lines
2.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Fri, 20 Aug 2021 13:03:55 -0700
|
||
|
|
Subject: [PATCH] Get entity default attributes
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
||
|
|
index 379acee1b5f2d06e6a96f3444783f4a29ca24095..0b15fe8b5da29bf691c394098f0203a49504242e 100644
|
||
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
||
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
||
|
|
@@ -183,5 +183,22 @@ public interface UnsafeValues {
|
||
|
|
* @return the server's protocol version
|
||
|
|
*/
|
||
|
|
int getProtocolVersion();
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Checks if the entity represented by the namespaced key has default attributes.
|
||
|
|
+ *
|
||
|
|
+ * @param entityKey the entity's key
|
||
|
|
+ * @return true if it has default attributes
|
||
|
|
+ */
|
||
|
|
+ boolean hasDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Gets the default attributes for the entity represented by the namespaced key.
|
||
|
|
+ *
|
||
|
|
+ * @param entityKey the entity's key
|
||
|
|
+ * @return an unmodifiable instance of Attributable for reading default attributes.
|
||
|
|
+ * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultEntityAttributes(NamespacedKey)} first)
|
||
|
|
+ */
|
||
|
|
+ @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
|
||
|
|
// Paper end
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
|
||
|
|
index d36d314383713bac3b11f18d95b0809dce3cd6e0..48aa290dbcf93715ce58d56d6cf3216948f2f3f2 100644
|
||
|
|
--- a/src/main/java/org/bukkit/entity/EntityType.java
|
||
|
|
+++ b/src/main/java/org/bukkit/entity/EntityType.java
|
||
|
|
@@ -441,5 +441,24 @@ public enum EntityType implements Keyed, net.kyori.adventure.translation.Transla
|
||
|
|
Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys");
|
||
|
|
return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Checks if the entity has default attributes.
|
||
|
|
+ *
|
||
|
|
+ * @return true if it has default attributes
|
||
|
|
+ */
|
||
|
|
+ public boolean hasDefaultAttributes() {
|
||
|
|
+ return org.bukkit.Bukkit.getUnsafe().hasDefaultEntityAttributes(this.key);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Gets the default attributes for the entity.
|
||
|
|
+ *
|
||
|
|
+ * @return an unmodifiable instance of Attributable for reading default attributes.
|
||
|
|
+ * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultAttributes()} first)
|
||
|
|
+ */
|
||
|
|
+ public @NotNull org.bukkit.attribute.Attributable getDefaultAttributes() {
|
||
|
|
+ return org.bukkit.Bukkit.getUnsafe().getDefaultEntityAttributes(this.key);
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
}
|