From 731eab80edb774d651664775ea1e23837b5250ce Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 1 Feb 2018 22:24:37 -0500 Subject: [PATCH] Fix ArmorStand Item serialization Broken in 09182f737d8f734dea7e71914502700ce9a809c5 --- .../0269-Add-ArmorStand-Item-Meta.patch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0269-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0269-Add-ArmorStand-Item-Meta.patch index 03b6b7fe12..4bcf4f7cd9 100644 --- a/Spigot-Server-Patches/0269-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0269-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 67cd6fe88d1ff2f141e122db653a648877c14bbb Mon Sep 17 00:00:00 2001 +From 9cdf562f0b0ffc59c5855b61250ef35de620f0d3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -350,10 +350,18 @@ index 000000000..dc372f6db + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 0cdc8007a..990d1e619 100644 +index 0cdc8007a..2ab4a1cf4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1034,7 +1034,15 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -129,6 +129,7 @@ class CraftMetaItem implements ItemMeta, Repairable { + .put(CraftMetaFirework.class, "FIREWORK") + .put(CraftMetaCharge.class, "FIREWORK_EFFECT") + .put(CraftMetaKnowledgeBook.class, "KNOWLEDGE_BOOK") ++ .put(CraftMetaArmorStand.class, "ARMOR_STAND") + .put(CraftMetaItem.class, "UNSPECIFIC") + .build(); + +@@ -1034,7 +1035,15 @@ class CraftMetaItem implements ItemMeta, Repairable { CraftMetaEnchantedBook.STORED_ENCHANTMENTS.NBT, CraftMetaCharge.EXPLOSION.NBT, CraftMetaBlockState.BLOCK_ENTITY_TAG.NBT,