mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-27 15:09:34 +02:00
43 lines
1.7 KiB
Diff
43 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 2f65ce5d63ea4ad3a0b1b8fa47efa97b6641ef20..3ab43aab043ae59e541f708c8558ddf9bdd82f84 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
|
||
|
@@ -216,6 +216,31 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
|
||
|
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
|
||
|
boolean equalsCommon(CraftMetaItem meta) {
|
||
|
if (!super.equalsCommon(meta)) {
|