Paper/patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch
Nassim Jahnke 71c84c8132
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
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:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD

CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor

Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00

52 lines
1.8 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 26 Feb 2023 07:14:19 -0800
Subject: [PATCH] Fix SpawnEggMeta#get/setSpawnedType
diff --git a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
index b3447e22ab880eef7e84ba3c2f0cd6d5d0323d32..35deb3519f46047009b529d6a80517e25e6cf20a 100644
--- a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
@@ -17,7 +17,7 @@ public interface SpawnEggMeta extends ItemMeta {
* @return The entity type. May be null for implementation specific default.
* @deprecated different types are different items
*/
- @Deprecated
+ @Deprecated(forRemoval = true) // Paper
@Contract("-> fail")
EntityType getSpawnedType();
@@ -28,7 +28,7 @@ public interface SpawnEggMeta extends ItemMeta {
* default.
* @deprecated different types are different items
*/
- @Deprecated
+ @Deprecated(forRemoval = true) // Paper
@Contract("_ -> fail")
void setSpawnedType(EntityType type);
@@ -54,6 +54,22 @@ public interface SpawnEggMeta extends ItemMeta {
*/
void setSpawnedEntity(@NotNull EntitySnapshot snapshot);
+ // Paper start
+ /**
+ * Get the custom type of entity this egg will spawn.
+ *
+ * @return the entity type or null if no custom type is set
+ */
+ @org.jetbrains.annotations.Nullable EntityType getCustomSpawnedType();
+
+ /**
+ * Set the custom type of entity this egg will spawn.
+ *
+ * @param type the entity type or null to clear the custom type
+ */
+ void setCustomSpawnedType(@org.jetbrains.annotations.Nullable EntityType type);
+ // Paper end
+
@NotNull
@Override
SpawnEggMeta clone();