[Auto] Updated Upstream (CraftBukkit)

upcommit

CraftBukkit Changes:
200b2398 SPIGOT-4233: Fix some missing handled NBT tags

Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From 21d32208d1330db3a24876d99358f248ae04eb52 Mon Sep 17 00:00:00 2001
+From 9bdf8e39bf667d1c03da11f40e49c01a74539abe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0c54eaa529..c7ef9c6890 100644
+index 0c54eaa52..c7ef9c689 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -78,7 +78,7 @@ index 0c54eaa529..c7ef9c6890 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index f4672b9a48..8c0409797e 100644
+index f4672b9a4..8c0409797 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -201,7 +201,7 @@ index f4672b9a48..8c0409797e 100644
  
      static Map<Enchantment, Integer> 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 5464923759..94b19d1095 100644
+index 1fe5ddcd5..1d3333fd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -8,12 +8,14 @@ import java.lang.reflect.Constructor;
@@ -311,7 +311,7 @@ index 5464923759..94b19d1095 100644
              }
              clone.hideFlag = this.hideFlag;
              clone.unbreakable = this.unbreakable;
-@@ -1097,6 +1100,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1099,6 +1102,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
      }
  

Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From e70dede949dc8c684b7325092e8d1f3356469460 Mon Sep 17 00:00:00 2001
+From 7a4c416b18e3ab55375b0cce3279f9fe20dd0ee7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 35eb3181dd..a69f98cd63 100644
+index 35eb3181d..a69f98cd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -183,6 +183,8 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index 35eb3181dd..a69f98cd63 100644
          case CHEST:
          case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8c0409797e..83f89a2365 100644
+index 8c0409797..83f89a236 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -392,6 +392,8 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index 8c0409797e..83f89a2365 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 0000000000..0e8acf12e4
+index 000000000..0e8acf12e
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +1,309 @@
@@ -354,7 +354,7 @@ index 0000000000..0e8acf12e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 94b19d1095..683593a0b4 100644
+index 1d3333fd7..0990e7b3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -136,6 +136,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -365,7 +365,7 @@ index 94b19d1095..683593a0b4 100644
                      .put(CraftMetaItem.class, "UNSPECIFIC")
                      .build();
  
-@@ -1093,7 +1094,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1095,7 +1096,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                          CraftMetaCharge.EXPLOSION.NBT,
                          CraftMetaBlockState.BLOCK_ENTITY_TAG.NBT,
                          CraftMetaKnowledgeBook.BOOK_RECIPES.NBT,
@@ -383,7 +383,7 @@ index 94b19d1095..683593a0b4 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index f66cc81d9e..eb6cf1bb33 100644
+index f66cc81d9..eb6cf1bb3 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -6,6 +6,7 @@ import static org.hamcrest.Matchers.*;

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit cfc67965f397a7d1b930f4212eba07120a43b5f9
+Subproject commit 200b239819d6d57e4f031bc1e2a41cf4962ea5f1