TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-28 00:40:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/TFM-1.15' into TFM-1.15

Browse source
This commit is contained in:
Robinson Gallego 2020-02-03 23:55:13 -05:00
parent ee8eb30a92 47a62753d1
commit c5d778896e
2 changed files with 2 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
View file

@ -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;
}
}
}

46
src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java
View file

@ -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 = "/<command>", 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;
}
}