diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch
index 6bedb56e7..01fd97811 100644
--- a/CraftBukkit-Patches/0002-mc-dev-imports.patch
+++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch
@@ -3001,6 +3001,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
+--- /dev/null
++++ b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java
+@@ -0,0 +0,0 @@
++package net.minecraft.server;
++
++import java.io.IOException;
++
++public class PacketPlayInArmAnimation implements Packet<PacketListenerPlayIn> {
++
++    public PacketPlayInArmAnimation() {}
++
++    public void a(PacketDataSerializer packetdataserializer) throws IOException {}
++
++    public void b(PacketDataSerializer packetdataserializer) throws IOException {}
++
++    public void a(PacketListenerPlayIn packetlistenerplayin) {
++        packetlistenerplayin.a(this);
++    }
++}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
diff --git a/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch
index b0f25ff0e..f20254e06 100644
--- a/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch
@@ -4,6 +4,25 @@ Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets
 
 
+diff --git a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java
++++ b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java
+@@ -0,0 +0,0 @@ import java.io.IOException;
+ 
+ public class PacketPlayInArmAnimation implements Packet<PacketListenerPlayIn> {
+ 
++    public long timestamp; // Spigot
++
+     public PacketPlayInArmAnimation() {}
+ 
+-    public void a(PacketDataSerializer packetdataserializer) throws IOException {}
++    public void a(PacketDataSerializer packetdataserializer) throws IOException {
++        timestamp = System.currentTimeMillis(); // Spigot
++    }
+ 
+     public void b(PacketDataSerializer packetdataserializer) throws IOException {}
+ 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java