summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-18 14:13:20 +1000
committermd_5 <git@md-5.net>2018-07-18 14:13:20 +1000
commit15036eb75be1935b76c1e63078e39c6bb229fac1 (patch)
tree11e2d5658d82074aa8006735df3a1b84b1fa0828 /src/main/java
parentf18d78282ddb2f09f92b3095d43fd35630b4fec4 (diff)
downloadcraftbukkit-15036eb75be1935b76c1e63078e39c6bb229fac1.tar
craftbukkit-15036eb75be1935b76c1e63078e39c6bb229fac1.tar.gz
craftbukkit-15036eb75be1935b76c1e63078e39c6bb229fac1.tar.lz
craftbukkit-15036eb75be1935b76c1e63078e39c6bb229fac1.tar.xz
craftbukkit-15036eb75be1935b76c1e63078e39c6bb229fac1.zip
Fix changes that got lost late in development cycle
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
index 02b72b8a..503a1cf0 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
@@ -227,6 +227,11 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
}
if (spawnedType != null) {
+ if (entityTag != null) {
+ // Remove ID tag as it is now in the material
+ entityTag.remove(ENTITY_ID.NBT);
+ }
+
return CraftLegacy.fromLegacy(new MaterialData(Material.LEGACY_MONSTER_EGG, (byte) spawnedType.getTypeId()));
}