From 6ee16a913b38ff03a254b9b85b855ae14f5cee40 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 23:00:57 -0400 Subject: [PATCH] Update upstream --- Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch | 8 ++++---- .../Handle-Item-Meta-Inconsistencies.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch index 9bd280792b..762d1ae440 100644 --- a/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch @@ -40,7 +40,7 @@ index e2699564a..aad380c3b 100644 case TRAPPED_CHEST: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java new file mode 100644 -index 000000000..30941c7b0 +index 000000000..0e8acf12e --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java @@ -0,0 +0,0 @@ @@ -219,8 +219,8 @@ index 000000000..30941c7b0 + } + + @Override -+ void deserializeInternal(NBTTagCompound tag) { -+ super.deserializeInternal(tag); ++ void deserializeInternal(NBTTagCompound tag, Object context) { ++ super.deserializeInternal(tag, context); + + if (tag.hasKey(ENTITY_TAG.NBT)) { + entityTag = tag.getCompound(ENTITY_TAG.NBT); @@ -354,7 +354,7 @@ index 000000000..30941c7b0 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index f1430d226..a3f293e4c 100644 +index f21c1e846..a5fcf6bd5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable { diff --git a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch index 348cb9b594..997d285042 100644 --- a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch @@ -204,7 +204,7 @@ index f4672b9a4..e2699564a 100644 static Map getEnchantments(net.minecraft.server.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index b2190b01d..f1430d226 100644 +index f10de8550..f21c1e846 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -0,0 +0,0 @@ import java.lang.reflect.Constructor; @@ -274,7 +274,7 @@ index b2190b01d..f1430d226 100644 for (int i = 0; i < ench.size(); i++) { String id = ((NBTTagCompound) ench.get(i)).getString(ENCHANTMENTS_ID.NBT); @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable { - void deserializeInternal(NBTTagCompound tag) { + void deserializeInternal(NBTTagCompound tag, Object context) { } - static Map buildEnchantments(Map map, ItemMetaKey key) { diff --git a/work/Bukkit b/work/Bukkit index 0f4e33e9c7..d6214b1988 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 0f4e33e9c7a5b3fc9912c67265b725db43fc92cb +Subproject commit d6214b1988f3815e323c1c32c6885468ce21905e diff --git a/work/CraftBukkit b/work/CraftBukkit index ea7b61290a..2100017016 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ea7b61290a39f0ab355d7a723907ed312f713b05 +Subproject commit 210001701695ed79ae0b6b81e23125671913fe9c