From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com> Date: Thu, 4 May 2023 19:53:33 +0300 Subject: [PATCH] Toggle tick level when empty diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java index 3ec0d59235f573a0a39a575d0291a765b660c96c..2e86eea51be217d03e62163654c8d1a7a6c5036f 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java @@ -149,10 +149,12 @@ public class KaiijuWorldConfig { public boolean shulkerBoxDropContentsWhenDestroyed = true; public boolean fixVoidTrading = true; public boolean optimizeHoppers = true; + public boolean tickWhenEmpty = true; private void gameplaySettings() { shulkerBoxDropContentsWhenDestroyed = getBoolean("gameplay.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed); fixVoidTrading = getBoolean("gameplay.fix-void-trading", fixVoidTrading); optimizeHoppers = getBoolean("gameplay.optimize-hoppers", optimizeHoppers); + tickWhenEmpty = getBoolean("gameplay.tick-when-empty", tickWhenEmpty); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index 9ad16476bedc9ac3d44cd3fbecbf9cf326d6f1be..cbb7dce873f0aa1ae7f85a6f0985bbe8d66a54ae 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -744,7 +744,7 @@ public class ServerLevel extends Level implements WorldGenLevel { timings.doSounds.stopTiming(); // Spigot regionizedWorldData.setHandlingTick(false); // Folia - regionised ticking gameprofilerfiller.pop(); - boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players + boolean flag = kaiijuConfig.tickWhenEmpty || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players // Kaiiju - i don't think so if (flag) { this.resetEmptyTime();