diff --git a/CraftBukkit-Patches/0003-Spigot-Changes.patch b/CraftBukkit-Patches/0003-Spigot-Changes.patch
index f72ac9b2c8..5f0077c449 100644
--- a/CraftBukkit-Patches/0003-Spigot-Changes.patch
+++ b/CraftBukkit-Patches/0003-Spigot-Changes.patch
@@ -1,6 +1,6 @@
-From f6bda668b73c66e0cfeef52dedd4d211b8f64176 Mon Sep 17 00:00:00 2001
+From 95b1a5d79f65570a6e27ed4ece0630c57d19af27 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
-Date: Tue, 23 Apr 2013 11:17:36 +1000
+Date: Sat, 4 May 2013 10:14:01 +1000
Subject: [PATCH] Spigot Changes
@@ -238,26 +238,6 @@ index bee715b..9643480 100644
}
if (pendingchunktosave != null) {
-diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 0225f53..a8f1799 100644
---- a/src/main/java/net/minecraft/server/EntityItem.java
-+++ b/src/main/java/net/minecraft/server/EntityItem.java
-@@ -62,6 +62,7 @@ public class EntityItem extends Entity {
- this.lastTick = MinecraftServer.currentTick;
- // CraftBukkit end
-
-+ if (lastTick % 2 == 0) { // Spigot
- this.lastX = this.locX;
- this.lastY = this.locY;
- this.lastZ = this.locZ;
-@@ -100,6 +101,7 @@ public class EntityItem extends Entity {
- if (this.onGround) {
- this.motY *= -0.5D;
- }
-+ }
-
- // ++this.age; // CraftBukkit - Moved up
- if (!this.world.isStatic && this.age >= 6000) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5d10382..bc55a77 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
diff --git a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
index 2533eabacb..27454dba65 100644
--- a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From e5030bb8e88d57428375af160227ad56bde7b2f3 Mon Sep 17 00:00:00 2001
+From 5399bd4fdda73b55589eb48f69ee46ff3363c10d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@@ -6,10 +6,10 @@ Subject: [PATCH] Merge tweaks and configuration
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index e7481dd..9f1a7b7 100644
+index 0225f53..294ab8f 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
-@@ -116,7 +116,10 @@ public class EntityItem extends Entity {
+@@ -114,7 +114,10 @@ public class EntityItem extends Entity {
}
private void g() {
@@ -21,7 +21,7 @@ index e7481dd..9f1a7b7 100644
while (iterator.hasNext()) {
EntityItem entityitem = (EntityItem) iterator.next();
-@@ -145,11 +148,13 @@ public class EntityItem extends Entity {
+@@ -143,11 +146,13 @@ public class EntityItem extends Entity {
} else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
return false;
} else {
@@ -41,7 +41,7 @@ index e7481dd..9f1a7b7 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a77f48d..f5730d3 100644
+index 70dd295..b339688 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -949,6 +949,23 @@ public abstract class World implements IBlockAccess {
@@ -69,7 +69,7 @@ index a77f48d..f5730d3 100644
if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9da842e..a303090 100644
+index 63e8e69..68fd274 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -92,6 +92,8 @@ public class CraftWorld implements World {
diff --git a/CraftBukkit-Patches/0036-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0036-Prevent-handshake-spam-from-invalid-names.patch
index 64e59cac05..9401463b9d 100644
--- a/CraftBukkit-Patches/0036-Prevent-handshake-spam-from-invalid-names.patch
+++ b/CraftBukkit-Patches/0036-Prevent-handshake-spam-from-invalid-names.patch
@@ -1,4 +1,4 @@
-From 7a1b263624e29ee530bb982c6eb430b1b78cf8e0 Mon Sep 17 00:00:00 2001
+From 02595714633a1628bbccf8ee69e8fb4cb42ec2aa Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Sun, 14 Apr 2013 21:19:57 +0500
Subject: [PATCH] Prevent handshake spam from invalid names.
@@ -25,7 +25,7 @@ index 343af93..aa6609b 100644
public void a(DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 0e917e2..a3849b9 100644
+index b28f745..f2c52f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -6,6 +6,7 @@ import java.net.InetAddress;
@@ -44,7 +44,7 @@ index 0e917e2..a3849b9 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
-@@ -382,7 +384,9 @@ public class Spigot {
+@@ -381,7 +383,9 @@ public class Spigot {
}
/**