From 163d33a68bc1a153f3456c36a3de07679bf447bc Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> 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 --- .../Delay-Chunk-Unloads-based-on-Player-Movement.patch | 4 ++-- Spigot-Server-Patches/Make-entities-look-for-hoppers.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch index f48bd759b8..5cee660e8b 100644 --- a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -22,12 +22,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +0,0 @@ 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; diff --git a/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch index 7575336fca..616003715b 100644 --- a/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch @@ -88,7 +88,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + 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