Wait to check worlds until after server startup

SilverstoneMC · Nov 21, 2024 · 26e455a · 26e455a
1 parent 9a382de
commit 26e455a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/checksums.json b/checksums.json
@@ -1,4 +1,5 @@
 {
+  "3.7.2": "667E5D1630FA3D61BC39B059A991629B",
   "3.7.1": "192F4A25D138DF6D5765C4698B07BE3D",
   "3.7.0": "9958F067E96DB53627967BDBE165C714",
   "3.6.1": "9ED575EA17AC470E5BA9F32868AB5484",

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>net.silverstonemc</groupId>
     <artifactId>EntityClearer</artifactId>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

diff --git a/src/main/java/net/silverstonemc/entityclearer/Commands.java b/src/main/java/net/silverstonemc/entityclearer/Commands.java
@@ -89,7 +89,8 @@ private void debug(CommandSender sender) {
         // Dump config into debug file
         plugin.getLogger().info("Dumping config into debug file...");
         try {
-            Scanner scanner = new Scanner(new File(plugin.getDataFolder(), "config.yml"),
+            Scanner scanner = new Scanner(
+                new File(plugin.getDataFolder(), "config.yml"),
                 StandardCharsets.UTF_8);
             while (scanner.hasNextLine()) LogDebug.debugFile.write(scanner.nextLine() + "\n");
             scanner.close();
@@ -121,11 +122,16 @@ private void debug(CommandSender sender) {
         debug.debug(Level.INFO, "", "API version: " + Bukkit.getBukkitVersion());
         //noinspection AccessOfSystemProperties
         debug.debug(Level.INFO, "", "Java version: " + System.getProperty("java.version"));
+        debug.debug(Level.INFO, "", "Players online: " + Bukkit.getOnlinePlayers().size());
 
         debug.debug(Level.INFO, "", "Available world list: ");
         for (World world : Bukkit.getWorlds())
-            debug.debug(Level.INFO, "", " " + world.getName());
+            debug.debug(
+                Level.INFO,
+                "",
+                " " + world.getName() + " (" + world.getPlayers().size() + " players)");
 
+        debug.debug(Level.INFO, "", "");
         new ClearTask().removeEntitiesPreTask(new ConfigUtils().getWorlds("worlds"), false, false);
     }
 

diff --git a/src/main/java/net/silverstonemc/entityclearer/EntityClearer.java b/src/main/java/net/silverstonemc/entityclearer/EntityClearer.java
@@ -48,12 +48,17 @@ public void onEnable() {
         getCommand("entityclearer").setExecutor(new Commands());
         getCommand("entityclearer").setTabCompleter(new TabComplete());
 
-        getServer().getPluginManager().registerEvents(new ReloadEvent(this), this);
         getServer().getPluginManager().registerEvents(new ChecksumChecker(this), this);
+        getServer().getPluginManager().registerEvents(new ReloadEvent(this), this);
         getServer().getPluginManager().registerEvents(new UpdateChecker(this), this);
 
-        new KillTimer().start();
-        if (getConfig().getBoolean("low-tps.enabled")) new TpsMonitoring().tpsTimer(600);
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                new KillTimer().start();
+                if (getConfig().getBoolean("low-tps.enabled")) new TpsMonitoring().tpsTimer(200);
+            }
+        }.runTaskLater(this, 3L);
 
         // Log version update
         new BukkitRunnable() {

diff --git a/src/main/java/net/silverstonemc/entityclearer/utils/OnlinePlayers.java b/src/main/java/net/silverstonemc/entityclearer/utils/OnlinePlayers.java
@@ -8,7 +8,7 @@ public class OnlinePlayers {
     /**
      * Returns an object array containing the notEnoughPlayers boolean and a string indicating if the check was server-wide or world-wide.
      *
-     * @return Object[] {boolean, String}
+     * @return Object[]{boolean, String}
      */
     public Object[] isNotEnough(World world, String worldConfigName) {
         EntityClearer plugin = EntityClearer.getInstance();