mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 02:42:14 +01:00
2f92d4e00e
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: 01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs bc145b90 PR-940: Create registry for banner pattern and cat type CraftBukkit Changes: cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways 4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs b483a20db PR-1303: Create registry for banner pattern and cat type 4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
52 lines
1.8 KiB
Diff
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();
|