Update to 1.12.1

2017-08-03 16:36:06 +02:00
parent 2e157dd1b4
commit 6879328bf6
69 changed files with 414 additions and 489 deletions
--- a/Spigot-Server-Patches/0225-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0225-Implement-ensureServerConversions-API.patch
@@ -0,0 +1,27 @@
+From 70c9c339ad2d62a199d09706abb17f42e5f51a3c 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.13.3.windows.1
+