From ebb90ceeae1fa11b3db1d585d663b1707c94b1e0 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 23 May 2015 13:04:28 -0500
Subject: [PATCH] Things compile better when you update mc-dev

---
 Spigot-Server-Patches/0003-mc-dev-imports.patch | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0003-mc-dev-imports.patch b/Spigot-Server-Patches/0003-mc-dev-imports.patch
index 295e7d8343..db7414b55c 100644
--- a/Spigot-Server-Patches/0003-mc-dev-imports.patch
+++ b/Spigot-Server-Patches/0003-mc-dev-imports.patch
@@ -1,6 +1,6 @@
-From 70713e64a607952dc3ffc9a7d5cda1fb3d281877 Mon Sep 17 00:00:00 2001
+From 4e15946e8e4c8df9593b9f1f10b3390e29526311 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Mon, 18 May 2015 17:32:46 -0500
+Date: Sat, 23 May 2015 13:00:52 -0500
 Subject: [PATCH] mc-dev imports
 
 
@@ -690,10 +690,10 @@ index 0000000..0d108eb
 +}
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
 new file mode 100644
-index 0000000..451a0bb
+index 0000000..264bcfa
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,97 @@
 +package net.minecraft.server;
 +
 +public class ItemBlock extends Item {
@@ -768,7 +768,7 @@ index 0000000..451a0bb
 +        return false;
 +    }
 +
-+    public String e_(ItemStack itemstack) {
++    public String f_(ItemStack itemstack) {
 +        return this.a.a();
 +    }
 +
@@ -780,6 +780,13 @@ index 0000000..451a0bb
 +        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);
 +    }