diff --git a/Spigot-API-Patches/Entity-Origin-API.patch b/Spigot-API-Patches/Entity-Origin-API.patch
index 9cd7757889..35662fdbfd 100644
--- a/Spigot-API-Patches/Entity-Origin-API.patch
+++ b/Spigot-API-Patches/Entity-Origin-API.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
diff --git a/Spigot-Server-Patches/Add-velocity-warnings.patch b/Spigot-Server-Patches/Add-velocity-warnings.patch
index ad52f739f8..39d302a48e 100644
--- a/Spigot-Server-Patches/Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/Add-velocity-warnings.patch
@@ -17,7 +17,7 @@ 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
 @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/Entity-Origin-API.patch b/Spigot-Server-Patches/Entity-Origin-API.patch
index 0d44e74b57..4c34f98ebd 100644
--- a/Spigot-Server-Patches/Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/Entity-Origin-API.patch
@@ -118,7 +118,7 @@ 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
 @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/work/Bukkit b/work/Bukkit
index 7b5ab33d62..052c8e5eb5 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 7b5ab33d620b1d19e00152b4a0d64c160712c3b7
+Subproject commit 052c8e5eb578f9c62414f9002f8816e82a198cda
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ec47e791bd..f7d14f184d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ec47e791bda2be9e172e841fbfd50f0e40fcaaf4
+Subproject commit f7d14f184d386cb5b0dd604dd1fdcd683fe9e065
diff --git a/work/Spigot b/work/Spigot
index 8cbfc85b63..cd6ba67988 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 8cbfc85b6364a7c7be564bb7b1bb19769dbcee77
+Subproject commit cd6ba6798868b56caf949efe0d92fce1560b102e