From e6727223f8f61953883a547461ff61e88d58a77d Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Mon, 25 May 2015 15:59:30 -0500
Subject: [PATCH] Update to 1.8.6

---
 Spigot-API-Patches/POM-changes.patch       |  2 +-
 Spigot-Server-Patches/POM-Changes.patch    |  2 +-
 Spigot-Server-Patches/mc-dev-imports.patch | 59 ++++++++++++----------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index 50d6b7ac6e..3a4f9fd91a 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>org.github.paperspigot</groupId>
 +    <artifactId>paperspigot-api</artifactId>
-     <version>1.8.5-R0.1-SNAPSHOT</version>
+     <version>1.8.6-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index 0e844e901f..db47379d18 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    <groupId>org.github.paperspigot</groupId>
 +    <artifactId>paperspigot</artifactId>
      <packaging>jar</packaging>
-     <version>1.8.5-R0.1-SNAPSHOT</version>
+     <version>1.8.6-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>PaperSpigot</name>
diff --git a/Spigot-Server-Patches/mc-dev-imports.patch b/Spigot-Server-Patches/mc-dev-imports.patch
index 9259654c82..cc67db4ce8 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: Sat, 23 May 2015 13:00:52 -0500
+Date: Mon, 25 May 2015 15:37:00 -0500
 Subject: [PATCH] mc-dev imports
 
 
@@ -728,7 +728,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            if (world.setTypeAndData(blockposition, iblockdata1, 3)) {
 +                iblockdata1 = world.getType(blockposition);
 +                if (iblockdata1.getBlock() == this.a) {
-+                    a(world, blockposition, itemstack);
++                    a(world, entityhuman, blockposition, itemstack);
 +                    this.a.postPlace(world, blockposition, iblockdata1, entityhuman, itemstack);
 +                }
 +
@@ -742,33 +742,43 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +
-+    public static boolean a(World world, BlockPosition blockposition, ItemStack itemstack) {
-+        if (itemstack.hasTag() && itemstack.getTag().hasKeyOfType("BlockEntityTag", 10)) {
-+            TileEntity tileentity = world.getTileEntity(blockposition);
++    public static boolean a(World world, EntityHuman entityhuman, BlockPosition blockposition, ItemStack itemstack) {
++        MinecraftServer minecraftserver = MinecraftServer.getServer();
 +
-+            if (tileentity != null) {
-+                NBTTagCompound nbttagcompound = new NBTTagCompound();
-+                NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttagcompound.clone();
++        if (minecraftserver == null) {
++            return false;
++        } else {
++            if (itemstack.hasTag() && itemstack.getTag().hasKeyOfType("BlockEntityTag", 10)) {
++                TileEntity tileentity = world.getTileEntity(blockposition);
 +
-+                tileentity.b(nbttagcompound);
-+                NBTTagCompound nbttagcompound2 = (NBTTagCompound) itemstack.getTag().get("BlockEntityTag");
++                if (tileentity != null) {
++                    if (!world.isClientSide && tileentity.F() && !minecraftserver.getPlayerList().isOp(entityhuman.getProfile())) {
++                        return false;
++                    }
 +
-+                nbttagcompound.a(nbttagcompound2);
-+                nbttagcompound.setInt("x", blockposition.getX());
-+                nbttagcompound.setInt("y", blockposition.getY());
-+                nbttagcompound.setInt("z", blockposition.getZ());
-+                if (!nbttagcompound.equals(nbttagcompound1)) {
-+                    tileentity.a(nbttagcompound);
-+                    tileentity.update();
-+                    return true;
++                    NBTTagCompound nbttagcompound = new NBTTagCompound();
++                    NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttagcompound.clone();
++
++                    tileentity.b(nbttagcompound);
++                    NBTTagCompound nbttagcompound2 = (NBTTagCompound) itemstack.getTag().get("BlockEntityTag");
++
++                    nbttagcompound.a(nbttagcompound2);
++                    nbttagcompound.setInt("x", blockposition.getX());
++                    nbttagcompound.setInt("y", blockposition.getY());
++                    nbttagcompound.setInt("z", blockposition.getZ());
++                    if (!nbttagcompound.equals(nbttagcompound1)) {
++                        tileentity.a(nbttagcompound);
++                        tileentity.update();
++                        return true;
++                    }
 +                }
 +            }
-+        }
 +
-+        return false;
++            return false;
++        }
 +    }
 +
-+    public String f_(ItemStack itemstack) {
++    public String e_(ItemStack itemstack) {
 +        return this.a.a();
 +    }
 +
@@ -780,13 +790,6 @@ 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);
 +    }