From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic 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 4e3eac5f06a6ded0f152f1744fcebfeef6b48814..68b560af277d4913306fb1b9c88c2fadcd2f446a 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -209,5 +209,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 50d9442ffafdfabd4904dafae7daaeadcedee75b..5a0c96875d9c3bd32b4649a3fccd43af1ccb195b 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -447,5 +447,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 }