From 61bbe8c3b3cf157f04f1476c438c793c581c6d8a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 30 Jun 2017 18:13:06 -0500
Subject: [PATCH] Update upstream

---
 Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch | 5 +++--
 work/CraftBukkit                                             | 2 +-
 work/Spigot                                                  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
index 6561ab6f5f..3718c14e23 100644
--- a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
@@ -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/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 3f11e4279..ebb3e04bc 100644
+index 3f11e427..ebb3e04b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -0,0 +0,0 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -144,7 +144,7 @@ index 3f11e4279..ebb3e04bc 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 724da6772..935cbe867 100644
+index c743ae06..0cdc8007 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.annotation.RetentionPolicy;
@@ -249,6 +249,7 @@ index 724da6772..935cbe867 100644
      }
  
      public boolean addEnchant(Enchantment ench, int level, boolean ignoreRestrictions) {
+         Validate.notNull(ench, "Enchantment cannot be null");
          if (enchantments == null) {
 -            enchantments = new HashMap<Enchantment, Integer>(4);
 +            enchantments = new EnchantmentMap(); // Paper
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 0481ae963a..d603539842 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0481ae963aad545b2f1162d764bcbff18721e2f0
+Subproject commit d603539842fe24dc1b37130e47fafe734a542a69
diff --git a/work/Spigot b/work/Spigot
index 23b6354742..722832861f 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 23b6354742083ff4b613da6129a70ef94ede3d90
+Subproject commit 722832861f0300f0b1e9d9079b0085bca5387ce2