1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

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

@@ -1,4 +1,4 @@
-From a1209416ec3aa88eaa43a52746caff71f1044a61 Mon Sep 17 00:00:00 2001
+From e2ec596f328db2922bc58371a5af7e215905d352 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
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 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 01ab19434a..8b219b5fa2 100644
+index 01ab19434..8b219b5fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory {
@@ -22,5 +22,5 @@ index 01ab19434a..8b219b5fa2 100644
 +    // Paper end
  }
 -- 
-2.24.1
+2.25.0.windows.1