Allow provisionally disabling chunk GC

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-02-22 19:11:59 +11:00
parent 67374a6263
commit 14a8719dad
5 changed files with 24 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
From 20626aff9b21bae3c593e776dd70a820fbf27210 Mon Sep 17 00:00:00 2001
From a79861261884846b740f136b75bff9a91466a1ad Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 12:21:52 +1100
Subject: [PATCH] Spigot changes.
@@ -26,7 +26,7 @@ Subject: [PATCH] Spigot changes.
.../java/net/minecraft/server/WorldServer.java | 121 ++++-
.../java/org/bukkit/craftbukkit/CraftServer.java | 98 ++++-
.../java/org/bukkit/craftbukkit/CraftWorld.java | 76 +++-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 24 +
src/main/java/org/bukkit/craftbukkit/Spigot.java | 23 +
.../craftbukkit/chunkio/ChunkIOProvider.java | 2 +-
.../bukkit/craftbukkit/command/RestartCommand.java | 24 +
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 7 +
@@ -39,7 +39,7 @@ Subject: [PATCH] Spigot changes.
.../org/bukkit/craftbukkit/util/TimedThread.java | 37 ++
.../bukkit/craftbukkit/util/WatchdogThread.java | 88 ++++
src/main/resources/configurations/bukkit.yml | 30 ++
35 files changed, 1359 insertions(+), 100 deletions(-)
35 files changed, 1358 insertions(+), 100 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
create mode 100644 src/main/java/org/bukkit/craftbukkit/command/RestartCommand.java
create mode 100644 src/main/java/org/bukkit/craftbukkit/util/ExceptionHandler.java
@@ -1336,10 +1336,10 @@ index 6e364b1..45217cd 100644
return getChunkAt(x >> 4, z >> 4).getBlock(x & 0xF, y & 0xFF, z & 0xF);
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
new file mode 100644
index 0000000..a53c7b0
index 0000000..eab9abe
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -0,0 +1,24 @@
@@ -0,0 +1,23 @@
+package org.bukkit.craftbukkit;
+
+import org.bukkit.command.SimpleCommandMap;
@@ -1359,8 +1359,7 @@ index 0000000..a53c7b0
+ server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
+
+ if (server.chunkGCPeriod == 0) {
+ server.getLogger().severe("[Spigot] You should not disable chunk-gc. Resetting period-in-ticks to 600 ticks.");
+ server.chunkGCPeriod = 600;
+ server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
+ }
+ }
+}
@@ -2301,5 +2300,5 @@ index 61a95e3..5262ae1 100644
monsters: 70
animals: 15
--
1.8.1.1
1.8.1-rc2