From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 23 Feb 2023 13:19:13 -0800 Subject: [PATCH] Fix SpawnEggMeta#get/setSpawnedType diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java index 163b1712ce4a1c8f91028dc7c2cd56ba7ad8981f..726438237093abc85d9239f9c84be3df6d8318c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java @@ -224,6 +224,30 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { public void setSpawnedType(EntityType type) { throw new UnsupportedOperationException("Must change item type to set spawned type"); } + // Paper start + @Override + public EntityType getCustomSpawnedType() { + return java.util.Optional.ofNullable(this.entityTag) + .map(tag -> tag.getString(ENTITY_ID.NBT)) + .flatMap(net.minecraft.world.entity.EntityType::byString) + .map(org.bukkit.craftbukkit.util.CraftMagicNumbers::getEntityType) + .orElse(null); + } + + @Override + public void setCustomSpawnedType(final EntityType type) { + if (type == null) { + if (this.entityTag != null) { + this.entityTag.remove(ENTITY_ID.NBT); + } + } else { + if (this.entityTag == null) { + this.entityTag = new CompoundTag(); + } + this.entityTag.putString(ENTITY_ID.NBT, type.key().toString()); + } + } + // Paper end @Override public EntitySnapshot getSpawnedEntity() {