Update upstream

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