From b5ea6f1240014714a3cef5ebaa2fcf6c6eed52be Mon Sep 17 00:00:00 2001 From: Dan Mulloy Date: Sat, 25 Nov 2017 17:00:18 -0500 Subject: [PATCH] Use void generator for lobbies, include loaded chunks in /lag --- .../src/mineplex/core/monitor/LagMeter.java | 1 + Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java b/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java index 4790dc301..3c6337a7b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java @@ -166,5 +166,6 @@ public class LagMeter extends MiniPlugin player.sendMessage(F.main(getName(), ChatColor.YELLOW + "MEM")); player.sendMessage(F.main(getName(), ChatColor.GRAY + "Free-------" + ChatColor.YELLOW + (Runtime.getRuntime().freeMemory() / 1048576) + "MB")); player.sendMessage(F.main(getName(), ChatColor.GRAY + "Max--------" + ChatColor.YELLOW + (Runtime.getRuntime().maxMemory() / 1048576)) + "MB"); + player.sendMessage(F.main(getName(), ChatColor.YELLOW + String.valueOf(player.getWorld().getLoadedChunks().length) + ChatColor.GRAY + " chunks loaded")); } } \ No newline at end of file diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 74e8d36c8..4eb240565 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -33,6 +33,7 @@ import mineplex.core.boosters.BoosterManager; import mineplex.core.botspam.BotSpamManager; import mineplex.core.chat.ChatFormat; import mineplex.core.chat.IChatMessageFormatter; +import mineplex.core.common.generator.VoidGenerator; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilMath; @@ -100,6 +101,7 @@ import net.md_5.bungee.api.chat.HoverEvent.Action; import net.md_5.bungee.api.chat.TextComponent; import net.minecraft.server.v1_8_R3.EntityInsentient; import net.minecraft.server.v1_8_R3.EntityPlayer; +import net.minecraft.server.v1_8_R3.WorldServer; public class HubManager extends MiniClientPlugin implements IChatMessageFormatter { @@ -147,8 +149,13 @@ public class HubManager extends MiniClientPlugin implements IChatMess _worldData = require(WorldDataModule.class); _spawn = _worldData.getCustomLocation("SPAWN").get(0); + // Disable item merging - ((CraftWorld) _spawn.getWorld()).getHandle().spigotConfig.itemMerge = 0; + WorldServer nmsWorld = ((CraftWorld) _spawn.getWorld()).getHandle(); + nmsWorld.spigotConfig.itemMerge = 0; + + // Disable chunk generation + nmsWorld.generator = new VoidGenerator(); new ParkourManager(this, donationManager, new TaskManager(_plugin, clientManager)); _jumpManager = new JumpManager(this);