Upstream Merge

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch

@@ -1,14 +1,14 @@
-From dc55945b5c2fd28d17722ca421f6537adb422d8f Mon Sep 17 00:00:00 2001
+From 0bc311b8717924ada1e4fa43cc81d3caa7563ae8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3c03d5a..10d853b 100644
+index c867fcf..6c8aa41 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1087,6 +1087,13 @@ public class PlayerConnection extends Connection {
+@@ -1096,6 +1096,13 @@ public class PlayerConnection extends Connection {
  
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = worldserver.getEntity(packet7useentity.target);
@@ -23,5 +23,5 @@ index 3c03d5a..10d853b 100644
          this.player.u();
          if (entity != null) {
 -- 
-1.8.1.2
+1.8.3.2