Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)1.20

1 files changed, 0 insertions, 63 deletions

diff --git a/patches/api/0317-Get-entity-default-attributes.patch b/patches/api/0317-Get-entity-default-attributes.patch
deleted file mode 100644
index 32c28f3adf..0000000000
--- a/patches/api/0317-Get-entity-default-attributes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-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 a9e7c64e1f98ff73c1804466d7c79eaf343dde7c..c2b042ced0f32b0dafc13a2933c2bd9b18db774a 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -188,5 +188,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 6c40a989eff1163c19106c1e6b4c8fc01ace7280..6cf14afd2c1b8018c67c6cac302ae28bb12ab5a5 100644
---- a/src/main/java/org/bukkit/entity/EntityType.java
-+++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -449,6 +449,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
- 
-     /**