From 2dbd93ee7f90dfcb313b0d5affa3f7afcdb118e9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sun, 18 Jan 2015 18:17:11 +0000
Subject: [PATCH] Upstream merge

---
 .../0003-Skeleton-API-Implementations.patch   |  6 ++-
 ...kable-and-setUnbreakable-to-ItemMeta.patch | 37 ++++++++++++-------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index 2cb2177068..91cbd4a812 100644
--- 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
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.0
+
diff --git a/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
index 65f31859e6..4b8b217d95 100644
--- a/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
+++ b/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
@@ -52,9 +52,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      static Map<Enchantment, Integer> buildEnchantments(Map<String, Object> map, ItemMetaKey key) {
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
+         }
  
          applyEnchantments(enchantments, itemTag, ENCHANTMENTS);
- 
++ 
 +        // Spigot start
 +        if ( spigot.isUnbreakable() )
 +        {
@@ -62,9 +63,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +        // Spigot end
 +
+ 
          if (hasRepairCost()) {
              itemTag.setInt(REPAIR.NBT, repairCost);
-         }
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
  
      @Overridden
@@ -88,14 +89,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          hash = 61 * hash + (hasAttributes() ? this.attributes.hashCode() : 0);
          hash = 61 * hash + (hasRepairCost() ? this.repairCost : 0);
          hash = 61 * hash + unhandledTags.hashCode();
-+        hash = 61 * hash + (spigot.isUnbreakable() ? 1231 : 1237); // Spigot
+++        hash = 61 * hash + (spigot.isUnbreakable() ? 1231 : 1237); // Spigot
          return hash;
      }
  
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
+         if (hasRepairCost()) {
              builder.put(REPAIR.BUKKIT, repairCost);
          }
- 
++ 
 +        // Spigot start
 +        if ( spigot.isUnbreakable() )
 +        {
@@ -103,18 +105,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +        // Spigot end
 +
+ 
          return builder;
      }
+@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
+         synchronized (HANDLED_TAGS) {
+             if (HANDLED_TAGS.isEmpty()) {
+                 HANDLED_TAGS.addAll(Arrays.asList(
++                    UNBREAKABLE.NBT, // Spigot
+                     DISPLAY.NBT,
+                     REPAIR.NBT,
+                     ATTRIBUTES.NBT,
+@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
+             }
+             return HANDLED_TAGS;
+         }
+-    }
  
-@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
-     public static Set<String> getHandledTags() {
-         if (HANDLED_TAGS.isEmpty()) {
-             HANDLED_TAGS.addAll(Arrays.asList(
-+                UNBREAKABLE.NBT, // Spigot
-                 DISPLAY.NBT,
-                 REPAIR.NBT,
-                 ATTRIBUTES.NBT,
-@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {
@@ -134,4 +141,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      };
  
      @Override
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.0
+