Merge pull request #3207 from Multiverse/fix/purge-entities

Actually implement the auto-purge-entities config option

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/config/CoreConfigNodes.java

@@ -108,7 +108,7 @@ private <N extends Node> N node(N node) {
 
     final ConfigNode<Boolean> autoPurgeEntities = node(ConfigNode.builder("world.auto-purge-entities", Boolean.class)
             .comment("")
-            .comment("Sets whether Multiverse will purge mobs and entities automatically.")
+            .comment("Sets whether Multiverse will purge entities on world load based world's entity spawn config.")
             .defaultValue(false)
             .name("auto-purge-entities")
             .build());

src/main/java/org/mvplugins/multiverse/core/world/LoadedMultiverseWorld.java

@@ -15,6 +15,7 @@
 import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.teleportation.BlockSafety;
 import org.mvplugins.multiverse.core.teleportation.LocationManipulation;
+import org.mvplugins.multiverse.core.world.entity.EntityPurger;
 import org.mvplugins.multiverse.core.world.location.NullSpawnLocation;
 import org.mvplugins.multiverse.core.world.location.SpawnLocation;
 
@@ -27,20 +28,25 @@ public final class LoadedMultiverseWorld extends MultiverseWorld {
 
     private final BlockSafety blockSafety;
     private final LocationManipulation locationManipulation;
+    private final EntityPurger entityPurger;
 
     LoadedMultiverseWorld(
             @NotNull World world,
             @NotNull WorldConfig worldConfig,
+            @NotNull CoreConfig config,
             @NotNull BlockSafety blockSafety,
             @NotNull LocationManipulation locationManipulation,
-            @NotNull CoreConfig config) {
+            @NotNull EntityPurger entityPurger
+    ) {
         super(world.getName(), worldConfig, config);
         this.worldUid = world.getUID();
         this.blockSafety = blockSafety;
         this.locationManipulation = locationManipulation;
+        this.entityPurger = entityPurger;
 
         setupWorldConfig(world);
         setupSpawnLocation(world);
+        purgeEntitiesOnLoad();
     }
 
     private void setupWorldConfig(World world) {
@@ -101,6 +107,12 @@ private Location readSpawnFromWorld(World world) {
         return location;
     }
 
+    private void purgeEntitiesOnLoad() {
+        if (config.isAutoPurgeEntities()) {
+            entityPurger.purgeEntities(this);
+        }
+    }
+
     /**
      * Gets the Unique ID of this world.
      *

src/main/java/org/mvplugins/multiverse/core/world/MultiverseWorld.java

@@ -33,7 +33,7 @@ public sealed class MultiverseWorld permits LoadedMultiverseWorld {
      */
     WorldConfig worldConfig;
 
-    private final CoreConfig config;
+    protected final CoreConfig config;
     private String colourlessAlias = "";
 
     MultiverseWorld(String worldName, WorldConfig worldConfig, CoreConfig config) {

src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java

@@ -48,6 +48,7 @@
 import org.mvplugins.multiverse.core.utils.result.FailureReason;
 import org.mvplugins.multiverse.core.utils.FileUtils;
 import org.mvplugins.multiverse.core.world.biomeprovider.BiomeProviderFactory;
+import org.mvplugins.multiverse.core.world.entity.EntityPurger;
 import org.mvplugins.multiverse.core.world.generators.GeneratorProvider;
 import org.mvplugins.multiverse.core.world.helpers.DataStore.GameRulesStore;
 import org.mvplugins.multiverse.core.world.helpers.DataTransfer;
@@ -91,8 +92,8 @@ public final class WorldManager {
     private final PluginManager pluginManager;
     private final CorePermissions corePermissions;
     private final ServerProperties serverProperties;
-    @NotNull
     private final CoreConfig config;
+    private final EntityPurger entityPurger;
 
     @Inject
     WorldManager(
@@ -106,7 +107,8 @@ public final class WorldManager {
             @NotNull PluginManager pluginManager,
             @NotNull CorePermissions corePermissions,
             @NotNull ServerProperties serverProperties,
-            @NotNull CoreConfig config) {
+            @NotNull CoreConfig config,
+            @NotNull EntityPurger entityPurger) {
         this.worldsConfigManager = worldsConfigManager;
         this.worldNameChecker = worldNameChecker;
         this.biomeProviderFactory = biomeProviderFactory;
@@ -118,6 +120,7 @@ public final class WorldManager {
         this.corePermissions = corePermissions;
         this.serverProperties = serverProperties;
         this.config = config;
+        this.entityPurger = entityPurger;
 
         this.worldsMap = new HashMap<>();
         this.loadedWorldsMap = new HashMap<>();
@@ -312,9 +315,11 @@ private LoadedMultiverseWorld newLoadedMultiverseWorld(
         LoadedMultiverseWorld loadedWorld = new LoadedMultiverseWorld(
                 world,
                 worldConfig,
+                config,
                 blockSafety,
                 locationManipulation,
-                config);
+                entityPurger
+        );
         setDefaultEnvironmentScale(mvWorld);
         loadedWorldsMap.put(loadedWorld.getName(), loadedWorld);
         saveWorldsConfig();
@@ -390,9 +395,11 @@ private Attempt<LoadedMultiverseWorld, LoadFailureReason> newLoadedMultiverseWor
         LoadedMultiverseWorld loadedWorld = new LoadedMultiverseWorld(
                 bukkitWorld,
                 worldConfig,
+                config,
                 blockSafety,
                 locationManipulation,
-                config);
+                entityPurger
+        );
         loadedWorldsMap.put(loadedWorld.getName(), loadedWorld);
         saveWorldsConfig();
         pluginManager.callEvent(new MVWorldLoadedEvent(loadedWorld));