From 608791d918b904f30879089bd4e92fc5e782976c Mon Sep 17 00:00:00 2001 From: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Tue, 21 Jan 2020 15:09:38 +1100 Subject: [PATCH 1/2] This is no longer required (#182) --- .../command/Command_unloadchunks.java | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java deleted file mode 100644 index 3fc14a76..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java +++ /dev/null @@ -1,46 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Chunk; -import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Unloads chunks not currently in use", usage = "/", aliases = "uc") -public class Command_unloadchunks extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - FUtil.adminAction(sender.getName(), "Unloading unused chunks", false); - - int numChunks = 0; - - for (World world : server.getWorlds()) - { - numChunks += unloadUnusedChunks(world); - } - - FUtil.playerMsg(sender, numChunks + " chunks unloaded."); - return true; - } - - private int unloadUnusedChunks(World world) - { - int numChunks = 0; - - for (Chunk loadedChunk : world.getLoadedChunks()) - { - if (!world.isChunkInUse(loadedChunk.getX(), loadedChunk.getZ()) && world.unloadChunk(loadedChunk)) - { - numChunks++; - } - } - - return numChunks; - } -} From 47a62753d1a395dd46a9b54dea3c9938b5b96c27 Mon Sep 17 00:00:00 2001 From: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Wed, 22 Jan 2020 14:37:51 +1100 Subject: [PATCH 2/2] Wow Seth, how did you not see this? (#185) --- .../java/me/totalfreedom/totalfreedommod/EntityWiper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java index 5e70f9c3..1b89127a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java @@ -58,7 +58,7 @@ public class EntityWiper extends FreedomService { for (Entity entity : world.getEntities()) { - if (!BLACKLIST.contains(entity.getType()) && !Groups.MOB_TYPES.contains(entity.getType())) + if (!BLACKLIST.contains(entity.getType()) || !Groups.MOB_TYPES.contains(entity.getType())) { entity.remove(); removed++; @@ -67,4 +67,4 @@ public class EntityWiper extends FreedomService } return removed; } -} \ No newline at end of file +}