diff --git a/CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch b/CraftBukkit-Patches/0023-Allow-for-toggling-of-spawn-chunks.patch
similarity index 53%
rename from CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch
rename to CraftBukkit-Patches/0023-Allow-for-toggling-of-spawn-chunks.patch
index 1c5c76b..264726b 100644
--- a/CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch
+++ b/CraftBukkit-Patches/0023-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,22 +1,22 @@
-From ac6e927fe693f9aad65e4f891acb012d3c2c851a Mon Sep 17 00:00:00 2001
+From 9fabcb8c01694846801acbba68197f184b2001fa Mon Sep 17 00:00:00 2001
 From: Dmck2b <itallhappenedverysuddenly@gmail.com>
-Date: Tue, 8 Jul 2014 23:55:29 +0100
-Subject: [PATCH] Allow disabling of spawn chunks always being loaded
+Date: Thu, 10 Jul 2014 16:57:10 +0100
+Subject: [PATCH] Allow for toggling of spawn chunks
 
+Now with 100% more confirmed working by creator
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9741e94..2dc61fc 100644
+index 62b732d..f722db5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -285,6 +285,8 @@ public abstract class World implements IBlockAccess {
- 
-         this.B();
-         this.a();
-+        
-+        this.keepSpawnInMemory = paperSpigotConfig.keepSpawnInMemory;
- 
-         this.getServer().addWorld(this.world); // CraftBukkit
-     }
+@@ -223,6 +223,7 @@ public abstract class World implements IBlockAccess {
+         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
+         this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit
+         // CraftBukkit end
++        this.keepSpawnInMemory = this.paperSpigotConfig.keepSpawnInMemory; // PaperSpigot
+         // Spigot start
+         this.chunkTickRadius = (byte) ( ( this.getServer().getViewDistance() < 7 ) ? this.getServer().getViewDistance() : 7 );
+         this.chunkTickList = new net.minecraft.util.gnu.trove.map.hash.TLongShortHashMap( spigotConfig.chunksPerTick * 5, 0.7f, Long.MIN_VALUE, Short.MIN_VALUE );
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 index e627c4e..39bbd62 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
diff --git a/CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch
index 1633ae4..e7d637e 100644
--- a/CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch
+++ b/CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch
@@ -1,14 +1,14 @@
-From e500258c8af7eccbb1ba5ac34d711cacaa71449c Mon Sep 17 00:00:00 2001
+From 1f6ae06ada4f1d1e0b09d23ee917fd1d38df9ea1 Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Thu, 26 Jun 2014 18:37:29 -0400
 Subject: [PATCH] Fix Null Tile Entity Worlds
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b2d24a7..a943d41 100644
+index f722db5..94b785e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2022,6 +2022,7 @@ public abstract class World implements IBlockAccess {
+@@ -2021,6 +2021,7 @@ public abstract class World implements IBlockAccess {
                      }
                  }