Update from upstream SpigotMC

6669d6ecd2b
b2740df50bb
bf71dc61149
fba27a2ea80
92ee7e7f8ec
b28f0d3de23
4beb4ac3918
0ddb6f3dde8
afe301fe892
b8f6402bbbe

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From 80cd16f04a4511aff368dbe080503feb517aeb80 Mon Sep 17 00:00:00 2001
+From b8c7995e487a20b69ee32985463571acbd2673c5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -124,10 +124,10 @@ index 3b9bfec..e4d0e41 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 1f7b523..651f81c 100644
+index 661fbae..92a6270 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -666,4 +666,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -667,4 +667,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
      public final String toString() {
          return SerializableMeta.classMap.get(getClass()) + "_META:" + serialize(); // TODO: cry
      }