From 56ceecc67481496a702346991a6fb4711e7202ee Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 9 Dec 2014 19:58:37 -0600
Subject: [PATCH] Update from upstream SpigotMC

c5492f80081
d5bf8668b99
a93b19a04cd
---
 Bukkit-Patches/0001-POM-Changes.patch                      | 7 -------
 .../0128-Limit-block-placement-interaction-packets.patch   | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch
index 35134c5c2c..93507f7c78 100644
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@@ -25,13 +25,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
  
-+    <parent>
-+        <groupId>org.spigotmc</groupId>
-+        <artifactId>spigot-parent</artifactId>
-+        <version>dev-SNAPSHOT</version>
-+        <relativePath>../pom.xml</relativePath>
-+    </parent>
-+
 +    <repositories>
 +        <repository>
 +            <id>sonatype-snapshots</id>
diff --git a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch
index 9cd381e9dd..545552eba5 100644
--- a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              float f1 = this.player.pitch;
              float f2 = this.player.yaw;
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
-             if (event == null || event.useItemInHand() != Event.Result.DENY) {
+             if (!cancelled) {
                  this.player.playerInteractManager.useItem(this.player, this.player.world, itemstack);
              }
 +            }