Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 03:55:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix SpawnEggMeta#get/setSpawnedType (#8907)

Browse Source
This commit is contained in:
Jake Potrebic 2023-03-18 10:32:03 -07:00 committed by GitHub
parent 5730a94208
commit 11f5158eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
patches/api/0419-Fix-SpawnEggMeta-get-setSpawnedType.patch Normal file
View File

@ -0,0 +1,47 @@
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 9ae84de43018e2dc9df5e1a56244d8812c2ffbb8..c190dff53e18994c93c35b6a9502cba38e6886ed 100644
--- a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
@@ -15,7 +15,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();
@@ -26,10 +26,26 @@ public interface SpawnEggMeta extends ItemMeta {
* default.
* @deprecated different types are different items
*/
- @Deprecated
+ @Deprecated(forRemoval = true) // Paper
@Contract("_ -> fail")
void setSpawnedType(EntityType type);
+ // 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();

42
patches/server/0966-Fix-SpawnEggMeta-get-setSpawnedType.patch Normal file
View File

@ -0,0 +1,42 @@
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)) {