Merge pull request #26 from SLNE-Development/fix/fix-event-server-display-if-offline

Fix/fix event server display if offline

Author: JoField08

src/main/kotlin/dev/slne/surf/lobby/PaperMain.kt

@@ -23,6 +23,7 @@ class PaperMain : SuspendingJavaPlugin() {
     override fun onEnable() {
         if (surfNpcHook) {
             SurfNpcHook.initialize()
+            SurfNpcHook.startSyncTask()
         }
 
         if (surfHologramHook) {
@@ -51,6 +52,10 @@ class PaperMain : SuspendingJavaPlugin() {
     }
 
     override fun onDisable() {
+        if (surfNpcHook) {
+            SurfNpcHook.stopSyncTask()
+        }
+
         redisApi.disconnect()
     }
 

src/main/kotlin/dev/slne/surf/lobby/hook/npc/SurfNpcHook.kt

@@ -21,10 +21,13 @@ import dev.slne.surf.surfapi.core.api.font.toSmallCaps
 import dev.slne.surf.surfapi.core.api.messages.adventure.clickOpensUrl
 import dev.slne.surf.surfapi.core.api.messages.adventure.playSound
 import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
+import io.papermc.paper.threadedregions.scheduler.ScheduledTask
 import net.kyori.adventure.text.format.TextDecoration
+import org.bukkit.Bukkit
 import org.bukkit.Sound
 import org.bukkit.entity.EntityType
 import org.bukkit.entity.Player
+import java.util.concurrent.TimeUnit
 
 object SurfNpcHook {
     lateinit var survivalNpc: Npc
@@ -35,6 +38,8 @@ object SurfNpcHook {
     lateinit var spawnEventNpc: Npc
     lateinit var shopNpc: Npc
 
+    var eventServerDisplayName: String = "Event"
+
     fun initialize() {
         createSurvivalNpc()
         createEventNpc()
@@ -89,13 +94,6 @@ object SurfNpcHook {
         }
     }
 
-    private val eventServerDisplayName by lazy {
-        val server = surfCoreApi.getServerByName(lobbyConfig.eventServerName)
-            ?: error("Event server with name ${lobbyConfig.eventServerName} not found")
-
-        server.displayName
-    }
-
     private fun createEventNpc() {
         eventNpc = npc {
             displayName = {
@@ -278,4 +276,25 @@ object SurfNpcHook {
                 }
             } ?: error("Event server with name ${lobbyConfig.eventServerName} not found")
     }
+
+    private lateinit var syncTask: ScheduledTask
+
+    fun startSyncTask() {
+        syncTask = Bukkit.getAsyncScheduler().runAtFixedRate(plugin, {
+            val server =
+                surfCoreApi.getServerByName(lobbyConfig.eventServerName) ?: return@runAtFixedRate
+
+            if (eventServerDisplayName != server.displayName) {
+                eventServerDisplayName = server.displayName
+
+                eventNpc.refresh()
+            }
+        }, 0L, 30L, TimeUnit.SECONDS)
+    }
+
+    fun stopSyncTask() {
+        if (::syncTask.isInitialized) {
+            syncTask.cancel()
+        }
+    }
 }