some improvements for modules iterating over entities

xGinko · Feb 16, 2024 · bc9e7dd · bc9e7dd
1 parent d2c8671
commit bc9e7dd
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 23 deletions.
diff --git a/...rc/main/java/me/moomoo/anarchyexploitfixes/modules/lagpreventions/FallingBlockStasis.java b/...rc/main/java/me/moomoo/anarchyexploitfixes/modules/lagpreventions/FallingBlockStasis.java
@@ -44,7 +44,8 @@ public String category() {
 
     @Override
     public void enable() {
-        this.scheduledTask = plugin.getServer().getGlobalRegionScheduler().runAtFixedRate(plugin, task -> run(), check_period_in_ticks, check_period_in_ticks);
+        this.scheduledTask = plugin.getServer().getGlobalRegionScheduler()
+                .runAtFixedRate(plugin, task -> run(), check_period_in_ticks, check_period_in_ticks);
     }
 
     @Override

diff --git a/...e/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveAllSkullsPeriodically.java b/...e/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveAllSkullsPeriodically.java
@@ -5,7 +5,8 @@
 import me.moomoo.anarchyexploitfixes.config.Config;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import org.bukkit.World;
-import org.bukkit.entity.WitherSkull;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 
 public class RemoveAllSkullsPeriodically implements AnarchyExploitFixesModule {
 
@@ -49,8 +50,10 @@ public void disable() {
 
     private void run() {
         for (World world : plugin.getServer().getWorlds()) {
-            for (WitherSkull witherSkull : world.getEntitiesByClass(WitherSkull.class)) {
-                witherSkull.getScheduler().run(plugin, kill -> witherSkull.remove(), null);
+            for (Entity entity : world.getEntities()) {
+                if (entity.getType() == EntityType.WITHER_SKULL) {
+                    entity.getScheduler().run(plugin, kill -> entity.remove(), null);
+                }
             }
         }
     }

diff --git a/...va/me/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveSkullsAfterXTicks.java b/...va/me/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveSkullsAfterXTicks.java
@@ -5,7 +5,8 @@
 import me.moomoo.anarchyexploitfixes.config.Config;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import org.bukkit.World;
-import org.bukkit.entity.WitherSkull;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 
 public class RemoveSkullsAfterXTicks implements AnarchyExploitFixesModule {
 
@@ -56,12 +57,14 @@ public void disable() {
 
     private void run() {
         for (World world : plugin.getServer().getWorlds()) {
-            for (WitherSkull witherSkull : world.getEntitiesByClass(WitherSkull.class)) {
-                witherSkull.getScheduler().run(plugin, killIfOld -> {
-                    if (witherSkull.getTicksLived() > maxAgeInTicks) {
-                        witherSkull.remove();
-                    }
-                }, null);
+            for (Entity entity : world.getEntities()) {
+                if (entity.getType() == EntityType.WITHER_SKULL) {
+                    entity.getScheduler().run(plugin, killIfOld -> {
+                        if (entity.getTicksLived() > maxAgeInTicks) {
+                            entity.remove();
+                        }
+                    }, null);
+                }
             }
         }
     }

diff --git a/...java/me/moomoo/anarchyexploitfixes/modules/preventions/withers/WitherSpawningAtSpawn.java b/...java/me/moomoo/anarchyexploitfixes/modules/preventions/withers/WitherSpawningAtSpawn.java
@@ -5,6 +5,7 @@
 import me.moomoo.anarchyexploitfixes.config.Config;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
+import me.moomoo.anarchyexploitfixes.utils.LogUtil;
 import net.kyori.adventure.text.TextReplacementConfig;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -18,6 +19,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
 
 public class WitherSpawningAtSpawn implements AnarchyExploitFixesModule, Listener {
 
@@ -35,8 +37,12 @@ public WitherSpawningAtSpawn() {
         defaults.put("world_the_end", 5000);
         ConfigSection section = config.getConfigSection("preventions.withers.disable-wither-spawning-at-spawn.worlds", defaults);
         for (String world : section.getKeys(false)) {
-            Integer radius = Integer.valueOf(section.getString(world));
-            this.worldsAndTheirRadiuses.put(world, radius);
+            try {
+                Integer radius = Integer.valueOf(section.getString(world));
+                this.worldsAndTheirRadiuses.put(world, radius);
+            } catch (NumberFormatException e) {
+                LogUtil.moduleLog(Level.WARNING, name(), "Radius for world '" + world + "' is not a valid integer.");
+            }
         }
     }
 

diff --git a/...e/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveAllSkullsPeriodically.java b/...e/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveAllSkullsPeriodically.java
@@ -4,7 +4,8 @@
 import me.moomoo.anarchyexploitfixes.config.Config;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import org.bukkit.World;
-import org.bukkit.entity.WitherSkull;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 
 public class RemoveAllSkullsPeriodically implements AnarchyExploitFixesModule, Runnable {
 
@@ -43,8 +44,10 @@ public boolean shouldEnable() {
     @Override
     public void run() {
         for (World world : plugin.getServer().getWorlds()) {
-            for (WitherSkull witherSkull : world.getEntitiesByClass(WitherSkull.class)) {
-                witherSkull.remove();
+            for (Entity entity : world.getEntities()) {
+                if (entity.getType() == EntityType.WITHER_SKULL) {
+                    entity.remove();
+                }
             }
         }
     }

diff --git a/...va/me/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveSkullsAfterXTicks.java b/...va/me/moomoo/anarchyexploitfixes/modules/preventions/withers/RemoveSkullsAfterXTicks.java
@@ -4,7 +4,8 @@
 import me.moomoo.anarchyexploitfixes.config.Config;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import org.bukkit.World;
-import org.bukkit.entity.WitherSkull;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 
 public class RemoveSkullsAfterXTicks implements AnarchyExploitFixesModule, Runnable {
 
@@ -50,9 +51,11 @@ public boolean shouldEnable() {
     @Override
     public void run() {
         for (World world : plugin.getServer().getWorlds()) {
-            for (WitherSkull witherSkull : world.getEntitiesByClass(WitherSkull.class)) {
-                if (witherSkull.getTicksLived() > maxAgeInTicks) {
-                    witherSkull.remove();
+            for (Entity entity : world.getEntities()) {
+                if (entity.getType() == EntityType.WITHER_SKULL) {
+                    if (entity.getTicksLived() > maxAgeInTicks) {
+                        entity.remove();
+                    }
                 }
             }
         }

diff --git a/...java/me/moomoo/anarchyexploitfixes/modules/preventions/withers/WitherSpawningAtSpawn.java b/...java/me/moomoo/anarchyexploitfixes/modules/preventions/withers/WitherSpawningAtSpawn.java
@@ -5,6 +5,7 @@
 import me.moomoo.anarchyexploitfixes.config.Config;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
+import me.moomoo.anarchyexploitfixes.utils.LogUtil;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -16,6 +17,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
 
 public class WitherSpawningAtSpawn implements AnarchyExploitFixesModule, Listener {
 
@@ -32,10 +34,12 @@ public WitherSpawningAtSpawn() {
         defaults.put("world_nether", 5000);
         defaults.put("world_the_end", 5000);
         ConfigSection section = config.getConfigSection("preventions.withers.disable-wither-spawning-at-spawn.worlds", defaults);
-        if (section != null) {
-            for (String world : section.getKeys(false)) {
+        for (String world : section.getKeys(false)) {
+            try {
                 Integer radius = Integer.valueOf(section.getString(world));
-                worldsAndTheirRadiuses.put(world, radius);
+                this.worldsAndTheirRadiuses.put(world, radius);
+            } catch (NumberFormatException e) {
+                LogUtil.moduleLog(Level.WARNING, name(), "Radius for world '" + world + "' is not a valid integer.");
             }
         }
     }