From a44f5dd1b50f94e3cf2d116cec535b588748bbe6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 15 Feb 2015 12:55:54 +1100
Subject: [PATCH] More conflict resolution.

---
 ...sUnbreakable-and-setUnbreakable-to-ItemMeta.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
index 04172e3943..f5811d1eec 100644
--- a/CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
+++ b/CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
@@ -78,9 +78,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public String getDisplayName() {
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
-                 && (this.hasLore() ? that.hasLore() && this.lore.equals(that.lore) : !that.hasLore())
                  && (this.hasAttributes() ? that.hasAttributes() && this.attributes.equals(that.attributes) : !that.hasAttributes())
                  && (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost())
+                 && (this.unhandledTags.equals(that.unhandledTags))
 -                && (this.hideFlag == that.hideFlag);
 +                && (this.hideFlag == that.hideFlag)
 +                && (this.spigot.isUnbreakable() == that.spigot.isUnbreakable()); // Spigot
@@ -88,8 +88,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      /**
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
-         hash = 61 * hash + (hasAttributes() ? this.attributes.hashCode() : 0);
          hash = 61 * hash + (hasRepairCost() ? this.repairCost : 0);
+         hash = 61 * hash + unhandledTags.hashCode();
          hash = 61 * hash + hideFlag;
 +        hash = 61 * hash + (spigot.isUnbreakable() ? 1231 : 1237); // Spigot
          return hash;
@@ -114,10 +114,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          synchronized (HANDLED_TAGS) {
              if (HANDLED_TAGS.isEmpty()) {
                  HANDLED_TAGS.addAll(Arrays.asList(
-+                    UNBREAKABLE.NBT, // Spigot
-                     DISPLAY.NBT,
-                     REPAIR.NBT,
-                     ATTRIBUTES.NBT,
++                        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()