Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,4 +1,4 @@
-From 860e77cf4f2406d97b047e02f8f15a69e0bcce05 Mon Sep 17 00:00:00 2001
+From 2d1c5eb57b7b0407cbaaf89c84200d6037754f6d 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 8d98a70..d32a2d2 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 fdc888d..d61e6fc 100644
+index 3fee3e8..25de653 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1258,6 +1258,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1280,6 +1280,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {
@@ -81,5 +81,5 @@ index fdc888d..d61e6fc 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0