1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-21 05:55:08 +01:00
PaperMC/patches/api/0390-Fix-SpawnEggMeta-get-setSpawnedType.patch
Bjarne Koll da7138233f
Updated Upstream (Bukkit/CraftBukkit/Spigot) ()
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:
ed0ec489 SPIGOT-7965: Unknown TransformReason for Hoglins
9db03457 SPIGOT-7964: Fix typo in Deprecation annotation
d14119af PR-1082: Add "since" to Deprecation annotations
e8a318d4 PR-1067: Add method to get Advancement requirements

CraftBukkit Changes:
40dd796db SPIGOT-7971: NotSerializableException on serialize CraftUseCooldownComponent
fa85c5e0a SPIGOT-7968: ProjectileHitEvent not trigerred when arrow hits entity
b75b792ec SPIGOT-7970: World#getMaxHeight() returning incorrect value
2b9a094bb SPIGOT-7965: Unknown TransformReason for Hoglins
fd3f5a380 SPIGOT-7966: Some trees do not generate with #generateTree
f2822317c PR-1515: Add a Class reader and Class node argument provider
07abf6852 PR-1514: Add a test case for ClassTraverser
a7577cb24 Fix Inventory#addItem not respecting max stack size
066a74e74 PR-1490: Add method to get Advancement requirements
4a1df30e4 PR-1512: Test Art class based on specific values instead of the implementation, to better catch implementation changes
53254c56f PR-1503: Simplify CAS loop to getAndSet
e9447dc5e Make BlockDataMeta#setBlockData hide unspecified states
dd08a7120 SPIGOT-7960: Fix inconsistency between natural item drop coordinates
e9e8ed753 SPIGOT-7960: Improve natural item drop methods

Spigot Changes:
60c9969b Rebuild patches
2024-12-03 15:47:48 +01:00

51 lines
1.9 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 2151946cf791c4c37b2ad527fe20bd784a037190..159055dfc6bd1eb77e07c5eb199c3ae892a749e0 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(since = "1.13")
+ @Deprecated(since = "1.13", forRemoval = true) // Paper
@Contract("-> fail")
EntityType getSpawnedType();
@@ -28,7 +28,7 @@ public interface SpawnEggMeta extends ItemMeta {
* default.
* @deprecated different types are different items
*/
- @Deprecated(since = "1.13")
+ @Deprecated(since = "1.13", 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();