mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Update spawn chunk persistence patch"

Browse source 
This reverts commit 27494d6d9f.
This commit is contained in:
Zach Brown 2014-07-09 23:46:54 -05:00
parent 27494d6d9f
commit f23a372321
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CraftBukkit-Patches/0023-Allow-for-the-toggling-of-persistent-spawn-chunks.patch → CraftBukkit-Patches/0023-Allow-disabling-of-spawn-chunks-always-being-loaded.patch
View file

@ -1,25 +1,22 @@
From 926c4d5892cded795794d47cebf36304fa6198f9 Mon Sep 17 00:00:00 2001
From ac6e927fe693f9aad65e4f891acb012d3c2c851a Mon Sep 17 00:00:00 2001
From: Dmck2b <itallhappenedverysuddenly@gmail.com>
Date: Tue, 8 Jul 2014 23:55:29 +0100
Subject: [PATCH] Allow for the toggling of persistent spawn chunks
Subject: [PATCH] Allow disabling of spawn chunks always being loaded
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 62b732d..04eda07 100644
index 9741e94..2dc61fc 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -286,7 +286,11 @@ public abstract class World implements IBlockAccess {
@@ -285,6 +285,8 @@ 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

6
CraftBukkit-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch
View file

@ -1,14 +1,14 @@
From bbfbddb2fd835d3a2a138ad0ba1b000dd0a36768 Mon Sep 17 00:00:00 2001
From e500258c8af7eccbb1ba5ac34d711cacaa71449c 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 04eda07..c92313f 100644
index b2d24a7..a943d41 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2024,6 +2024,7 @@ public abstract class World implements IBlockAccess {
@@ -2022,6 +2022,7 @@ public abstract class World implements IBlockAccess {
}
}