Merge pull request #18 from SLNE-Development/fix/fix-dimension-change-despawns-npc

feat: add WorldChangeListener to handle NPC respawning on world change

Author: TheBjoRedCraft

surf-npc-bukkit/src/main/kotlin/dev/slne/surf/npc/bukkit/BukkitMain.kt

@@ -7,10 +7,11 @@ import dev.slne.surf.npc.api.npc.property.NpcPropertyType
 import dev.slne.surf.npc.bukkit.command.NpcCommand
 import dev.slne.surf.npc.bukkit.listener.ConnectionListener
 import dev.slne.surf.npc.bukkit.listener.NpcListener
+import dev.slne.surf.npc.bukkit.listener.WorldChangeListener
 import dev.slne.surf.npc.bukkit.npc.property.impl.*
 import dev.slne.surf.npc.core.property.propertyTypeRegistry
 import dev.slne.surf.npc.core.service.storageService
-import org.bukkit.Bukkit
+import dev.slne.surf.surfapi.bukkit.api.event.register
 import org.bukkit.plugin.java.JavaPlugin
 
 class BukkitMain : SuspendingJavaPlugin() {
@@ -19,7 +20,8 @@ class BukkitMain : SuspendingJavaPlugin() {
             NpcListener(),
             PacketListenerPriority.NORMAL
         )
-        Bukkit.getPluginManager().registerEvents(ConnectionListener(), this)
+        ConnectionListener().register()
+        WorldChangeListener().register()
 
         propertyTypeRegistry.register(BooleanPropertyType(NpcPropertyType.Types.BOOLEAN))
         propertyTypeRegistry.register(ComponentPropertyType(NpcPropertyType.Types.COMPONENT))

surf-npc-bukkit/src/main/kotlin/dev/slne/surf/npc/bukkit/controller/BukkitNpcController.kt

@@ -221,10 +221,6 @@ class BukkitNpcController : NpcController, Services.Fallback {
             return NpcRespawnResult.Failure(NpcRespawnFailureReason.NOT_EXIST)
         }
 
-        if (npc.viewers.contains(uuid)) {
-            return NpcRespawnResult.Failure(NpcRespawnFailureReason.ALREADY_SPAWNED)
-        }
-
         npc.despawn(uuid)
         npc.spawn(uuid)
 

surf-npc-bukkit/src/main/kotlin/dev/slne/surf/npc/bukkit/listener/WorldChangeListener.kt

@@ -0,0 +1,23 @@
+package dev.slne.surf.npc.bukkit.listener
+
+import dev.slne.surf.npc.api.npc.location.NpcLocation
+import dev.slne.surf.npc.api.npc.property.NpcProperty
+import dev.slne.surf.npc.core.controller.npcController
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerChangedWorldEvent
+
+class WorldChangeListener : Listener {
+    @EventHandler
+    fun onWorldChanged(event: PlayerChangedWorldEvent) {
+        val player = event.player
+        val world = player.world
+
+        npcController.getNpcs().mapNotNull {
+            val npcLocation = it.getPropertyValue(NpcProperty.Internal.LOCATION, NpcLocation::class)
+            if (npcLocation?.world == world.name) it to npcLocation else null
+        }.forEach { (npc, _) ->
+            npcController.reShowNpc(npc, player.uniqueId)
+        }
+    }
+}