Update upstream B/CB/S

Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch

@@ -1,27 +0,0 @@
-From 7e748e9639b070df6acfe66f76e2b72dab3a4baf Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 4 May 2016 22:43:12 -0400
-Subject: [PATCH] Implement ensureServerConversions API
-
-This will take a Bukkit ItemStack and run it through any conversions a server process would perform on it,
-to ensure it meets latest minecraft expectations.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 49ebad22e..eb6987338 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -194,4 +194,11 @@ public final class CraftItemFactory implements ItemFactory {
-     public Color getDefaultLeatherColor() {
-         return DEFAULT_LEATHER_COLOR;
-     }
-+
-+    // Paper start
-+    @Override
-+    public ItemStack ensureServerConversions(ItemStack item) {
-+        return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
-+    }
-+    // Paper end
- }
--- 
-2.14.2
-