fix: ensure spread spawning doesn't run in other worlds (#85)

* fix: spread spawning in other worlds

Author: Helia8

geary-papermc-spawning/src/main/kotlin/com/mineinabyss/geary/papermc/spawning/SpawningFeature.kt

@@ -67,10 +67,27 @@ class SpawningFeature(context: FeatureContext) : Feature(context) {
     }
 
     override fun enable() {
+        // -- Spread Spawn logic --
+        val spreadConfig by config(
+            "spread_config", plugin.dataPath,
+            SpreadEntityTypesConfig(),
+            mergeUpdates = false,
+            formats = ConfigFormats(
+                listOf(
+                    Format(
+                        "yml", Yaml(
+                            serializersModule = gearyPaper.worldManager.global.getAddon(SerializableComponents).serializers.module,
+                            configuration = YamlConfiguration(strictMode = false)
+                        )
+                    )
+                )
+            )
+        )
+        val mainWorld = Bukkit.getWorld(spreadConfig.worldName) ?: error("World ${spreadConfig.worldName} not found, cannot initialize spread spawning")
+
         // -- Database logic --
         val db = plugin.sqliteDatabase(Path("spawns.db")) {
-            val world = Bukkit.getWorlds().firstOrNull() ?: error("No worlds found, cannot initialize spawning database")
-            SpawningSchema(listOf(world)).init()
+            SpawningSchema(listOf(mainWorld)).init()
         }
         database = db
 
@@ -100,24 +117,6 @@ class SpawningFeature(context: FeatureContext) : Feature(context) {
             spawnAttempts = config.maxSpawnAttemptsPerPlayer,
             mobSpawner = mobSpawner,
         )
-
-        // -- Spread Spawn logic --
-        val spreadConfig by config(
-            "spread_config", plugin.dataPath,
-            SpreadEntityTypesConfig(),
-            mergeUpdates = false,
-            formats = ConfigFormats(
-                listOf(
-                    Format(
-                        "yml", Yaml(
-                            serializersModule = gearyPaper.worldManager.global.getAddon(SerializableComponents).serializers.module,
-                            configuration = YamlConfiguration(strictMode = false)
-                        )
-                    )
-                )
-            )
-        )
-        val mainWorld = Bukkit.getWorld(spreadConfig.worldName) ?: error("World ${spreadConfig.worldName} not found, cannot initialize spread spawning")
         val posChooser = InChunkLocationChooser(mobSpawner, mainWorld)
         val dao = SpawnLocationsDAO()
         val chunkChooser = SpreadChunkChooser(logger, mainWorld, db, dao)
@@ -133,7 +132,7 @@ class SpawningFeature(context: FeatureContext) : Feature(context) {
         )
 
         listeners(
-            ListSpawnListener(spreadSpawner, db, dao, plugin),
+            ListSpawnListener(spreadSpawner, db, dao, plugin, mainWorld),
             SpreadEntityDeathListener(
                 spreadSpawner, db, plugin, mainWorld
             )

geary-papermc-spawning/src/main/kotlin/com/mineinabyss/geary/papermc/spawning/listeners/SpreadEntitySpawnListener.kt

@@ -8,6 +8,7 @@ import com.mineinabyss.geary.papermc.tracking.entities.toGearyOrNull
 import me.dvyy.sqlite.Database
 import org.bukkit.Chunk
 import org.bukkit.Location
+import org.bukkit.World
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.world.ChunkLoadEvent
@@ -19,11 +20,13 @@ class ListSpawnListener(
     private val spawner: SpreadSpawner,
     private val db: Database,
     private val dao: SpawnLocationsDAO,
-    private val plugin: Plugin
+    private val plugin: Plugin,
+    private val mainWorld: World,
 ) : Listener {
 
     @EventHandler
     fun ChunkLoadEvent.onChunkLoad() {
+        if (chunk.world != mainWorld) return
         plugin.launch {
             triggerSpawn(chunk)
         }