fix: add chunk-ticket during respawn

MineInAbyss · Feb 7, 2025 · bace91d · bace91d
1 parent 2a40a07
commit bace91d
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/listeners/PlayerListener.kt b/src/main/kotlin/com/mineinabyss/bonfire/listeners/PlayerListener.kt
@@ -49,9 +49,17 @@ class PlayerListener : Listener {
         val loc = bonfireRespawn.bonfireLocation
 
         loc.world.getChunkAtAsyncUrgently(loc).thenAccept { chunk ->
-            val bonfireEntity =
-                chunk.entities.filterIsBonfire().find { it.uniqueId == bonfireRespawn.bonfireUuid } ?: return@thenAccept
-            val bonfireData = bonfireEntity.toGeary().get<Bonfire>() ?: return@thenAccept
+            chunk.addPluginChunkTicket(bonfire.plugin)
+            val bonfireEntity = chunk.entities.filterIsBonfire().find { it.uniqueId == bonfireRespawn.bonfireUuid }
+            if (bonfireEntity == null) {
+                chunk.removePluginChunkTicket(bonfire.plugin)
+                return@thenAccept
+            }
+            val bonfireData = bonfireEntity.toGeary().get<Bonfire>()
+            if (bonfireData == null) {
+                chunk.removePluginChunkTicket(bonfire.plugin)
+                return@thenAccept
+            }
 
             when {
                 bonfireEntity.isBonfire && player.uniqueId in bonfireData.bonfirePlayers -> {
@@ -72,6 +80,7 @@ class PlayerListener : Listener {
                     player.toGeary().remove<BonfireRespawn>()
                 }
             }
+            chunk.removePluginChunkTicket(bonfire.plugin)
         }
     }