mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 c36c004156d3a89dc2209423c57a2ce230d686dc..a6d2370113eb44c0863b7837362dbb350f5057c6 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() {
|