From 4de67b82cfdb2e293b74d3cb7e667aabcbea2a98 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Fri, 30 Jan 2015 09:36:43 +0000
Subject: [PATCH] Fix the 'Remove uneeded validation' patch

Looks like it may have been broken during the 1.8 update (or it was always
broken)
---
 .../0148-Remove-uneeded-validation.patch            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch
index 39496bb5b..4ec857bf8 100644
--- a/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch
+++ b/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch
@@ -1,13 +1,22 @@
-From a891dafd04483eed0eb8a093651f1aba00120547 Mon Sep 17 00:00:00 2001
+From 5973bc2910615bddecb6be2e5e5701e5188c35cc Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Fri, 15 Aug 2014 18:11:09 -0400
 Subject: [PATCH] Remove uneeded validation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 3a87cb7..070b23a 100644
+index 02f727a..99d3226 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -230,7 +230,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+             this.lore = new ArrayList<String>(meta.lore);
+         }
+ 
+-        if (meta.hasEnchants()) {
++        if (meta.enchantments != null) { // Spigot
+             this.enchantments = new HashMap<Enchantment, Integer>(meta.enchantments);
+         }
+ 
 @@ -531,7 +531,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
      }