diff --git a/Bukkit b/Bukkit
index 5fa44fc1a..f714a0eb1 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 5fa44fc1a10ad8b3efca62ef0429aadce253c8bc
+Subproject commit f714a0eb175d1619a7847946cdea1056649cd597
diff --git a/CraftBukkit b/CraftBukkit
index b6bb6beb6..935349e3a 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit b6bb6beb63c794a74076b68686ea2298f1f51450
+Subproject commit 935349e3a39e3d39403afef0e750710fdc396d2a
diff --git a/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch
index b7ea4d783..b0eb154e3 100644
--- a/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
-         this.N.world = (WorldServer) this;
+         });
          this.getServer().addWorld(this.world);
          // CraftBukkit end
 +        this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper