From 2111d3575c97e6bcd779c1b2525b08d443bd0824 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 8 Dec 2022 17:50:40 +1100 Subject: [PATCH] #1121: Handle additional missing SpawnEggs in MetaSpawnEgg By: Doc --- .../org/bukkit/craftbukkit/inventory/CraftItemFactory.java | 2 ++ .../java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 4 +++- .../org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java index 4832a3393a..a1cbd96be3 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -152,6 +152,7 @@ public final class CraftItemFactory implements ItemFactory { case ENDERMITE_SPAWN_EGG: case EVOKER_SPAWN_EGG: case FOX_SPAWN_EGG: + case FROG_SPAWN_EGG: case GHAST_SPAWN_EGG: case GLOW_SQUID_SPAWN_EGG: case GOAT_SPAWN_EGG: @@ -188,6 +189,7 @@ public final class CraftItemFactory implements ItemFactory { case SQUID_SPAWN_EGG: case STRAY_SPAWN_EGG: case STRIDER_SPAWN_EGG: + case TADPOLE_SPAWN_EGG: case TRADER_LLAMA_SPAWN_EGG: case TROPICAL_FISH_SPAWN_EGG: case TURTLE_SPAWN_EGG: diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index 71eb617cbf..ffa7e9505f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -415,6 +415,7 @@ public final class CraftItemStack extends ItemStack { case ENDERMITE_SPAWN_EGG: case EVOKER_SPAWN_EGG: case FOX_SPAWN_EGG: + case FROG_SPAWN_EGG: case GHAST_SPAWN_EGG: case GLOW_SQUID_SPAWN_EGG: case GOAT_SPAWN_EGG: @@ -451,14 +452,15 @@ public final class CraftItemStack extends ItemStack { case SQUID_SPAWN_EGG: case STRAY_SPAWN_EGG: case STRIDER_SPAWN_EGG: + case TADPOLE_SPAWN_EGG: case TRADER_LLAMA_SPAWN_EGG: case TROPICAL_FISH_SPAWN_EGG: case TURTLE_SPAWN_EGG: case VEX_SPAWN_EGG: case VILLAGER_SPAWN_EGG: case VINDICATOR_SPAWN_EGG: - case WARDEN_SPAWN_EGG: case WANDERING_TRADER_SPAWN_EGG: + case WARDEN_SPAWN_EGG: case WITCH_SPAWN_EGG: case WITHER_SKELETON_SPAWN_EGG: case WITHER_SPAWN_EGG: diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java index c9b2cabedd..1f49a8cbf9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java @@ -39,6 +39,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { Material.ENDERMITE_SPAWN_EGG, Material.EVOKER_SPAWN_EGG, Material.FOX_SPAWN_EGG, + Material.FROG_SPAWN_EGG, Material.GHAST_SPAWN_EGG, Material.GLOW_SQUID_SPAWN_EGG, Material.GOAT_SPAWN_EGG, @@ -75,6 +76,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { Material.SQUID_SPAWN_EGG, Material.STRAY_SPAWN_EGG, Material.STRIDER_SPAWN_EGG, + Material.TADPOLE_SPAWN_EGG, Material.TRADER_LLAMA_SPAWN_EGG, Material.TROPICAL_FISH_SPAWN_EGG, Material.TURTLE_SPAWN_EGG,