Skip to content

Commit 26e455a

Browse files
committed
Wait to check worlds until after server startup
1 parent 9a382de commit 26e455a

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

checksums.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"3.7.2": "667E5D1630FA3D61BC39B059A991629B",
23
"3.7.1": "192F4A25D138DF6D5765C4698B07BE3D",
34
"3.7.0": "9958F067E96DB53627967BDBE165C714",
45
"3.6.1": "9ED575EA17AC470E5BA9F32868AB5484",

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>net.silverstonemc</groupId>
66
<artifactId>EntityClearer</artifactId>
7-
<version>3.7.1</version>
7+
<version>3.7.2</version>
88

99
<properties>
1010
<maven.compiler.source>17</maven.compiler.source>

src/main/java/net/silverstonemc/entityclearer/Commands.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ private void debug(CommandSender sender) {
8989
// Dump config into debug file
9090
plugin.getLogger().info("Dumping config into debug file...");
9191
try {
92-
Scanner scanner = new Scanner(new File(plugin.getDataFolder(), "config.yml"),
92+
Scanner scanner = new Scanner(
93+
new File(plugin.getDataFolder(), "config.yml"),
9394
StandardCharsets.UTF_8);
9495
while (scanner.hasNextLine()) LogDebug.debugFile.write(scanner.nextLine() + "\n");
9596
scanner.close();
@@ -121,11 +122,16 @@ private void debug(CommandSender sender) {
121122
debug.debug(Level.INFO, "", "API version: " + Bukkit.getBukkitVersion());
122123
//noinspection AccessOfSystemProperties
123124
debug.debug(Level.INFO, "", "Java version: " + System.getProperty("java.version"));
125+
debug.debug(Level.INFO, "", "Players online: " + Bukkit.getOnlinePlayers().size());
124126

125127
debug.debug(Level.INFO, "", "Available world list: ");
126128
for (World world : Bukkit.getWorlds())
127-
debug.debug(Level.INFO, "", " " + world.getName());
129+
debug.debug(
130+
Level.INFO,
131+
"",
132+
" " + world.getName() + " (" + world.getPlayers().size() + " players)");
128133

134+
debug.debug(Level.INFO, "", "");
129135
new ClearTask().removeEntitiesPreTask(new ConfigUtils().getWorlds("worlds"), false, false);
130136
}
131137

src/main/java/net/silverstonemc/entityclearer/EntityClearer.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,17 @@ public void onEnable() {
4848
getCommand("entityclearer").setExecutor(new Commands());
4949
getCommand("entityclearer").setTabCompleter(new TabComplete());
5050

51-
getServer().getPluginManager().registerEvents(new ReloadEvent(this), this);
5251
getServer().getPluginManager().registerEvents(new ChecksumChecker(this), this);
52+
getServer().getPluginManager().registerEvents(new ReloadEvent(this), this);
5353
getServer().getPluginManager().registerEvents(new UpdateChecker(this), this);
5454

55-
new KillTimer().start();
56-
if (getConfig().getBoolean("low-tps.enabled")) new TpsMonitoring().tpsTimer(600);
55+
new BukkitRunnable() {
56+
@Override
57+
public void run() {
58+
new KillTimer().start();
59+
if (getConfig().getBoolean("low-tps.enabled")) new TpsMonitoring().tpsTimer(200);
60+
}
61+
}.runTaskLater(this, 3L);
5762

5863
// Log version update
5964
new BukkitRunnable() {

src/main/java/net/silverstonemc/entityclearer/utils/OnlinePlayers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class OnlinePlayers {
88
/**
99
* Returns an object array containing the notEnoughPlayers boolean and a string indicating if the check was server-wide or world-wide.
1010
*
11-
* @return Object[] {boolean, String}
11+
* @return Object[]{boolean, String}
1212
*/
1313
public Object[] isNotEnough(World world, String worldConfigName) {
1414
EntityClearer plugin = EntityClearer.getInstance();

0 commit comments

Comments
 (0)