mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
52a05907c7
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: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
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();
|