Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin.code.style=official
kotlin.stdlib.default.dependency=false
org.gradle.parallel=true
version=1.21.11-3.0.7-SNAPSHOT
version=1.21.11-3.0.8-SNAPSHOT
5 changes: 5 additions & 0 deletions src/main/kotlin/dev/slne/surf/lobby/PaperMain.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class PaperMain : SuspendingJavaPlugin() {
override fun onEnable() {
if (surfNpcHook) {
SurfNpcHook.initialize()
SurfNpcHook.startSyncTask()
}

if (surfHologramHook) {
Expand Down Expand Up @@ -50,6 +51,10 @@ class PaperMain : SuspendingJavaPlugin() {
}

override fun onDisable() {
if (surfNpcHook) {
SurfNpcHook.stopSyncTask()
}

redisApi.disconnect()
}

Expand Down
33 changes: 26 additions & 7 deletions src/main/kotlin/dev/slne/surf/lobby/hook/npc/SurfNpcHook.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,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
Expand All @@ -36,6 +39,8 @@ object SurfNpcHook {
lateinit var spawnEventNpc: Npc
lateinit var shopNpc: Npc

var eventServerDisplayName: String = "Event"

fun initialize() {
createSurvivalNpc()
createEventNpc()
Expand Down Expand Up @@ -90,13 +95,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 = {
Expand Down Expand Up @@ -284,4 +282,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()
}
}
}