diff --git a/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch
index 3a9b84a7f..0decdb66c 100644
--- a/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch
+++ b/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch
@@ -1,4 +1,4 @@
-From d61790e52a4e3c10ac24a44892afa270b1c06abb Mon Sep 17 00:00:00 2001
+From 6a062cb66da8455d5997ade36cfe9ff64dc30ef0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:31:05 -0600
 Subject: [PATCH] Toggle for player interact limiter
@@ -22,10 +22,10 @@ index dca7763..0ffa733 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 83befa9..3116227 100644
+index e711f75..82b81be 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -875,7 +875,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -876,7 +876,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.player.resetIdleTimer();
          // Spigot start
          boolean throttled = false;
diff --git a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch
index 0b792d6f6..ea0bbd52c 100644
--- a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch
+++ b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch
@@ -1,5 +1,5 @@
-From 1b4d0016dc95c2e8fe1eba1a0d823f0da1292e41 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
+From a0a5b759e8c00ab29b5cdb1302d195e7cc73a5a5 Mon Sep 17 00:00:00 2001
+From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] FallingBlock and TNTPrimed source location API
 
@@ -193,7 +193,7 @@ index 564ea37..1820c7b 100644
  
      public EntityLiving getSource() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index db29976..dfb656a 100644
+index 19b13e5..187a16b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -880,7 +880,10 @@ public class CraftWorld implements World {
@@ -220,7 +220,7 @@ index db29976..dfb656a 100644
          } else if (Projectile.class.isAssignableFrom(clazz)) {
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new EntitySnowball(world, x, y, z);
-@@ -1108,7 +1114,8 @@ public class CraftWorld implements World {
+@@ -1111,7 +1117,8 @@ public class CraftWorld implements World {
                  throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
              }
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
diff --git a/Spigot-Server-Patches/0058-Timings-v2.patch b/Spigot-Server-Patches/0058-Timings-v2.patch
index f782a2e3f..c973ef121 100644
--- a/Spigot-Server-Patches/0058-Timings-v2.patch
+++ b/Spigot-Server-Patches/0058-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 3d6af186058dc01e3be7ac63a873ee40c9fc9a9a Mon Sep 17 00:00:00 2001
+From e24dd23649a658b70444d9a084da60a508c86cf7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -461,18 +461,18 @@ index 733f8e7..92b98a0 100644
          // Run tasks that are waiting on processing
          SpigotTimings.processQueueTimer.startTiming(); // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3116227..4badf18 100644
+index 82b81be..25d9d85 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -56,6 +56,7 @@ import org.bukkit.event.player.PlayerToggleSprintEvent;
- import org.bukkit.inventory.CraftingInventory;
+@@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
+ import org.bukkit.inventory.EquipmentSlot;
  import org.bukkit.inventory.InventoryView;
  import org.bukkit.util.NumberConversions;
 +import co.aikar.timings.SpigotTimings; // Paper
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1295,7 +1296,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1296,7 +1297,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -481,7 +481,7 @@ index 3116227..4badf18 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1306,22 +1307,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1307,22 +1308,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -938,7 +938,7 @@ index 41d2d87..0000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1a3c6d7..e49057f 100644
+index 4a5de6b..582ab4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;