mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 17:31:06 +01:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
62 lines
2.8 KiB
Diff
62 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 a3045b63c4e63f8eac902beb0f48367a5e3e5d20..0a9a50251093e1ea605a748eb8d899f34b26ef7b 100644
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
|
@@ -208,5 +208,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 032a252688b6dbefb05a0d4f91791e102bbae0cd..4aa2d483b706fbf6ba0dc5126de74ee532e12382 100644
|
|
--- a/src/main/java/org/bukkit/entity/EntityType.java
|
|
+++ b/src/main/java/org/bukkit/entity/EntityType.java
|
|
@@ -446,5 +446,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
|
|
}
|