From 27494d6d9f2ecac302a5ad680fe7eb008dfb2df2 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Wed, 9 Jul 2014 22:05:48 -0500 Subject: [PATCH] Update spawn chunk persistence patch --- ...e-toggling-of-persistent-spawn-chunks.patch} | 17 ++++++++++------- .../0024-Fix-Null-Tile-Entity-Worlds.patch | 6 +++--- 2 files changed, 13 insertions(+), 10 deletions(-) rename CraftBukkit-Patches/{0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch => 0023-Allow-for-the-toggling-of-persistent-spawn-chunks.patch} (76%) diff --git a/CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch b/CraftBukkit-Patches/0023-Allow-for-the-toggling-of-persistent-spawn-chunks.patch similarity index 76% rename from CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch rename to CraftBukkit-Patches/0023-Allow-for-the-toggling-of-persistent-spawn-chunks.patch index 1c5c76bea..848caec37 100644 --- a/CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch +++ b/CraftBukkit-Patches/0023-Allow-for-the-toggling-of-persistent-spawn-chunks.patch @@ -1,22 +1,25 @@ -From ac6e927fe693f9aad65e4f891acb012d3c2c851a Mon Sep 17 00:00:00 2001 +From 926c4d5892cded795794d47cebf36304fa6198f9 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Tue, 8 Jul 2014 23:55:29 +0100 -Subject: [PATCH] Allow disabling of spawn chunks always being loaded +Subject: [PATCH] Allow for the toggling of persistent spawn chunks 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..04eda07 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 { - +@@ -286,7 +286,11 @@ public abstract class World implements IBlockAccess { this.B(); this.a(); -+ -+ this.keepSpawnInMemory = paperSpigotConfig.keepSpawnInMemory; ++ this.keepSpawnInMemory = paperSpigotConfig.keepSpawnInMemory; // PaperSpigot ++ this.getServer().addWorld(this.world); // CraftBukkit ++ ++ this.getWorld().setKeepSpawnInMemory(this.keepSpawnInMemory); // PaperSpigot } + + protected abstract IChunkProvider j(); 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 1633ae47a..f34f0d048 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 bbfbddb2fd835d3a2a138ad0ba1b000dd0a36768 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" 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 04eda07..c92313f 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 { +@@ -2024,6 +2024,7 @@ public abstract class World implements IBlockAccess { } }