diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index e694efb6d..d10dbeda8 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From be3a8fec9af1e3d9ee43646c8572b98cf80721b4 Mon Sep 17 00:00:00 2001
+From 5992f37d03b1b4cf413785d1b9e716a1b48de5da Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 0144bef9..fbff9860 100644
+index e454e70a..c86c1c5f 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -487,4 +487,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -495,4 +495,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index 43164266e..539a1eea4 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 1e83856377d71c19e0e2fe2915a1bc529fc07f43 Mon Sep 17 00:00:00 2001
+From 3a836d77d00379939ad86b3f37f2add7368aca7a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -118,10 +118,10 @@ index ab3d6e484..2695cff93 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ce773218c..c39281247 100644
+index dc6a6b37b..d12278a52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -743,4 +743,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -749,4 +749,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -135,5 +135,5 @@ index ce773218c..c39281247 100644
 +    // Paper end
  }
 -- 
-2.13.1
+2.13.0.windows.1
 
diff --git a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
index d93f419ae..063dc1bcb 100644
--- a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
@@ -1,4 +1,4 @@
-From 3f6390e4802628e43e7f954ff1d99ef07868b7f3 Mon Sep 17 00:00:00 2001
+From 270f6a315741856dbbd5d1c9f41ea303c635fcf2 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
@@ -17,10 +17,10 @@ index 1381d234e..00208ff45 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c39281247..a664c145d 100644
+index d12278a52..05f3df4e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -239,12 +239,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -240,12 +240,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public void setVelocity(Vector velocity) {
          Preconditions.checkArgument(velocity != null, "velocity");
          velocity.checkFinite();
diff --git a/work/Bukkit b/work/Bukkit
index 7b5ab33d6..052c8e5eb 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 7b5ab33d620b1d19e00152b4a0d64c160712c3b7
+Subproject commit 052c8e5eb578f9c62414f9002f8816e82a198cda
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ec47e791b..f7d14f184 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ec47e791bda2be9e172e841fbfd50f0e40fcaaf4
+Subproject commit f7d14f184d386cb5b0dd604dd1fdcd683fe9e065
diff --git a/work/Spigot b/work/Spigot
index 8cbfc85b6..cd6ba6798 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 8cbfc85b6364a7c7be564bb7b1bb19769dbcee77
+Subproject commit cd6ba6798868b56caf949efe0d92fce1560b102e