Upstream merge

2015-01-18 18:17:11 +00:00 · 2015-01-18 18:17:11 +00:00 · 2dbd93ee7f
commit 2dbd93ee7f
parent 020079df9a
2 changed files with 27 additions and 16 deletions
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@ -128,8 +128,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
+             return HANDLED_TAGS;
         }
-         return HANDLED_TAGS;
     }
 +
 +    // Spigot start
@ -191,4 +191,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Spigot end
 }
--
+-- 
+1.9.5.msysgit.0
+