Allow provisionally disabling chunk GC

CraftBukkit-Patches/0002-Spigot-changes.patch

@@ -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.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
-+            server.chunkGCPeriod = 600;
 +        }
 +    }
 +}
@@ -2301,5 +2300,5 @@ index 61a95e3..5262ae1 100644
      monsters: 70
      animals: 15
 -- 
-1.8.1.1
+1.8.1-rc2
 

CraftBukkit-Patches/0019-Add-oreobfuscator-for-Spigot.patch

@@ -1,4 +1,4 @@
-From d5c3b76249048622b80ea5c21114608fbc07126c Mon Sep 17 00:00:00 2001
+From 418300d476c22377bddb9789d3b434ac4a649a7e Mon Sep 17 00:00:00 2001
 From: lishid <lishid@gmail.com>
 Date: Sat, 16 Feb 2013 10:05:25 +1100
 Subject: [PATCH] Add oreobfuscator for Spigot.
@@ -305,7 +305,7 @@ index 0000000..3e74103
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 30bc542..b124dab 100644
+index 8dda8b8..2600de4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -23,6 +23,14 @@ public class Spigot {
@@ -321,8 +321,8 @@ index 30bc542..b124dab 100644
 +        }
 +
          if (server.chunkGCPeriod == 0) {
-             server.getLogger().severe("[Spigot] You should not disable chunk-gc. Resetting period-in-ticks to 600 ticks.");
+             server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
-             server.chunkGCPeriod = 600;
+         }
 diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
 index 9d6d613..3228d17 100644
 --- a/src/main/resources/configurations/bukkit.yml
@@ -338,5 +338,5 @@ index 9d6d613..3228d17 100644
 +    disabled-worlds:
 +       - world_the_end
 -- 
-1.7.11.msysgit.1
+1.8.1-rc2
 

CraftBukkit-Patches/0026-Entity-Activation-Range-This-feature-gives-3-new-con.patch

@@ -1,4 +1,4 @@
-From f7e622680253de77248261ed9025946ceebb69e9 Mon Sep 17 00:00:00 2001
+From 805e4bb891c7e5a8bcdec220fb952fec33cbc1dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Feb 2013 19:45:09 +1100
 Subject: [PATCH] Entity Activation Range# This feature gives 3 new
@@ -137,7 +137,7 @@ index 21bd64a..a083ae4 100644
  
      public Block getBlockAt(int x, int y, int z) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 582dbab..75572f9 100644
+index 6eeabec..2a5fd45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -1,7 +1,10 @@
@@ -151,9 +151,9 @@ index 582dbab..75572f9 100644
  
  public class Spigot {
      public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
-@@ -37,5 +40,151 @@ public class Spigot {
+@@ -36,5 +39,151 @@ public class Spigot {
-             server.getLogger().severe("[Spigot] You should not disable chunk-gc. Resetting period-in-ticks to 600 ticks.");
+         if (server.chunkGCPeriod == 0) {
-             server.chunkGCPeriod = 600;
+             server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
          }
 +
 +    }

CraftBukkit-Patches/0027-Infrequently-send-tab-list-updates.patch

@@ -1,4 +1,4 @@
-From 7881af03e717e19de1c71b4b7f30618ebc7b2f54 Mon Sep 17 00:00:00 2001
+From a5d69c6fac6168ba145722a1e79027428c015bc1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 16 Feb 2013 19:05:15 +1100
 Subject: [PATCH] Infrequently send tab list updates.
@@ -36,7 +36,7 @@ index d13fa19..3fc66aa 100644
  
      public void sendAll(Packet packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 75572f9..a514471 100644
+index 2a5fd45..e0ecf21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -7,6 +7,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -47,8 +47,8 @@ index 75572f9..a514471 100644
      public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
          commandMap.register("bukkit", new org.bukkit.craftbukkit.command.RestartCommand("restart"));
          commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
-@@ -41,6 +42,7 @@ public class Spigot {
+@@ -40,6 +41,7 @@ public class Spigot {
-             server.chunkGCPeriod = 600;
+             server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
          }
  
 +        tabPing = configuration.getBoolean("settings.tab-ping", tabPing);

CraftBukkit-Patches/0029-Optimize-getTileEntities-performance.patch

@@ -1,11 +1,11 @@
-From 57cb706d68fe541313ce19b05256d6530fe2c0ec Mon Sep 17 00:00:00 2001
+From 4217d76754fcff68bd39d9d70625b8df90a5df09 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 20 Feb 2013 23:07:53 -0500
 Subject: [PATCH] Optimize getTileEntities performance
 
 Avoid traversing tile entities for every loaded chunk
 ---
- .../java/net/minecraft/server/WorldServer.java     |   21 +++++++++++---------
+ src/main/java/net/minecraft/server/WorldServer.java | 21 ++++++++++++---------
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
@@ -43,5 +43,5 @@ index 6cb3e24..8f0050a 100644
          return arraylist;
      }
 -- 
-1.7.10.1
+1.8.1-rc2