From b86b4ff71e566eceb2a6c148bee6a55d9138f32f Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 23 May 2015 13:04:28 -0500
Subject: [PATCH] Things compile better when you update mc-dev

---
 Spigot-Server-Patches/mc-dev-imports.patch | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/mc-dev-imports.patch b/Spigot-Server-Patches/mc-dev-imports.patch
index 36d169187c..9259654c82 100644
--- a/Spigot-Server-Patches/mc-dev-imports.patch
+++ b/Spigot-Server-Patches/mc-dev-imports.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Mon, 18 May 2015 17:32:46 -0500
+Date: Sat, 23 May 2015 13:00:52 -0500
 Subject: [PATCH] mc-dev imports
 
 
@@ -768,7 +768,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return false;
 +    }
 +
-+    public String e_(ItemStack itemstack) {
++    public String f_(ItemStack itemstack) {
 +        return this.a.a();
 +    }
 +
@@ -780,6 +780,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return this.a;
 +    }
 +
++    public static void d_(ItemStack itemstack) {
++        if (itemstack.hasTag() && itemstack.getTag().hasKeyOfType("BlockEntityTag", 10)) {
++            itemstack.getTag().remove("BlockEntityTag");
++        }
++
++    }
++
 +    public Item c(String s) {
 +        return this.b(s);
 +    }