Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0047-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From eb38a6812659dd0856232d86bd09699ee79f3298 Mon Sep 17 00:00:00 2001
+From dcba3bd4d498eca5b5833f67dc38eef0e87dbd12 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -57,10 +57,10 @@ index 4945955..ab39926 100644
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2542d56..eaffcdc 100644
+index bf3c9db..afbc3d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1259,6 +1259,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1257,6 +1257,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {
@@ -81,5 +81,5 @@ index 2542d56..eaffcdc 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.4.msysgit.0