From c62efac3eb66b658fd25d9ea13aa8158c557d5a5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 20:57:36 -0500 Subject: [PATCH] Default configuration changes Disable push based hoppers by default Set chunk unload delay to 15s by default Neither of these changes are retroactive for old users --- .../0158-Make-entities-look-for-hoppers.patch | 6 +++--- ...160-Delay-Chunk-Unloads-based-on-Player-Movement.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch index 8a6d16b7e..b40251777 100644 --- a/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From a23f74a3dfe8b30db36e7700bc380db109cbb060 Mon Sep 17 00:00:00 2001 +From 610d21cb97d0f91919916b135a646f3ece9b78a6 Mon Sep 17 00:00:00 2001 From: Techcable Date: Sat, 18 Jun 2016 01:01:37 -0500 Subject: [PATCH] Make entities look for hoppers @@ -78,7 +78,7 @@ index 0000000..aef7c2b + double getZ(); +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3500b6c..86fda1a 100644 +index 3500b6c..21c0a3f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -363,4 +363,9 @@ public class PaperWorldConfig { @@ -88,7 +88,7 @@ index 3500b6c..86fda1a 100644 + + public boolean isHopperPushBased; + private void isHopperPushBased() { -+ isHopperPushBased = getBoolean("hopper.push-based", true); ++ isHopperPushBased = getBoolean("hopper.push-based", false); + } } diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java diff --git a/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 2245a5bcc..806a0f992 100644 --- a/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 30b54896e79fe497994706d5ddabd083b11201e6 Mon Sep 17 00:00:00 2001 +From 3d70eed63d400403703741a82b6d244ad746d5b7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -17,17 +17,17 @@ This allows servers with smaller worlds who do less long distance exploring to s wasting cpu cycles on saving/unloading/reloading chunks repeatedly. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 86fda1a..17b90a0 100644 +index 21c0a3f..bfe0bdb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -368,4 +368,13 @@ public class PaperWorldConfig { private void isHopperPushBased() { - isHopperPushBased = getBoolean("hopper.push-based", true); + isHopperPushBased = getBoolean("hopper.push-based", false); } + + public long delayChunkUnloadsBy; + private void delayChunkUnloadsBy() { -+ delayChunkUnloadsBy = PaperConfig.getSeconds(getString("delay-chunk-unloads-by", "0s")); ++ delayChunkUnloadsBy = PaperConfig.getSeconds(getString("delay-chunk-unloads-by", "10s")); + if (delayChunkUnloadsBy > 0) { + log("Delaying chunk unloads by " + delayChunkUnloadsBy + " seconds"); + delayChunkUnloadsBy *= 1000;