diff --git a/CraftBukkit-Patches/0024-Player-Collision-API.patch b/CraftBukkit-Patches/0066-Player-Collision-API.patch
similarity index 86%
rename from CraftBukkit-Patches/0024-Player-Collision-API.patch
rename to CraftBukkit-Patches/0066-Player-Collision-API.patch
index 55ac7d33ac..1f39ef4910 100644
--- a/CraftBukkit-Patches/0024-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0066-Player-Collision-API.patch
@@ -1,14 +1,14 @@
-From 1bd195c36f5a4405afa8667244b0b0d871de5d10 Mon Sep 17 00:00:00 2001
+From 9d73975f8eba9e17bc92818862e36e7645302a24 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e1a3ca1..6770e04 100644
+index adb27d8..0a35df8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -410,7 +410,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -411,7 +411,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
  
              List list = this.world.getEntities(this, axisalignedbb);
  
@@ -31,12 +31,12 @@ index 6b8b8dd..34683a5 100644
                  Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 58e5217..6d2e765 100644
+index f9ac1e1..9ff8c86 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -53,6 +53,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public boolean keepLevel = false;
+@@ -54,6 +54,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public double maxHealthCache;
+     public int lastPing = -1; // Spigot
      // CraftBukkit end
 +    // Spigot start
 +    public boolean collidesWithEntities = true;
@@ -57,13 +57,14 @@ index 58e5217..6d2e765 100644
      public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
          super(world, s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6e9834f..b858b3d 100644
+index 3231226..1e415db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1077,6 +1077,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     // Spigot start
-     private final Spigot spigot = new Spigot()
-     {
+@@ -1122,6 +1122,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ 
+             getHandle().playerConnection.sendPacket( packet );
+         }
++
 +        @Override
 +        public boolean getCollidesWithEntities()
 +        {
diff --git a/CraftBukkit-Patches/0025-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0067-Fully-Disable-Snooper-When-Not-Required.patch
similarity index 87%
rename from CraftBukkit-Patches/0025-Fully-Disable-Snooper-When-Not-Required.patch
rename to CraftBukkit-Patches/0067-Fully-Disable-Snooper-When-Not-Required.patch
index d97f50d82e..a3e26d3b62 100644
--- a/CraftBukkit-Patches/0025-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0067-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,11 +1,11 @@
-From bc28c0a818b1b9aaba56538f03d67748d19d67c5 Mon Sep 17 00:00:00 2001
-From: agentk20 <agentkid20@gmail.com> 
+From fdee0331948e8b1d0373bb083b89c0fb244704c2 Mon Sep 17 00:00:00 2001
+From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 33eaecc..f12b19e 100644
+index 413e3d8..d186e47 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -498,11 +498,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo