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 07669aad6d9910174fbc8fdf3cdd54211fbfcee3..a25f7378e5cef3899c38dd34d369da0441951f24 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -203,5 +203,22 @@ public interface UnsafeValues { * @return true if valid repair, false if not */ public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial); + + /** + * 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 976f701ed9b9873945a5628173c580e2e6873864..6905614c3d277a3a725554f02cc92d4b3430eecc 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -441,6 +441,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans 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 /**