Fix BonfireRemoved not being serializable, leaving furniture behind b…

…ecause of error
MineInAbyss · Dec 5, 2023 · 57b87bf · 57b87bf
1 parent 6384817
commit 57b87bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/components/BonfireRemoved.kt b/src/main/kotlin/com/mineinabyss/bonfire/components/BonfireRemoved.kt
@@ -1,3 +1,7 @@
 package com.mineinabyss.bonfire.components
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable @SerialName("bonfire:bonfire_removed")
 class BonfireRemoved
diff --git a/src/main/kotlin/com/mineinabyss/bonfire/listeners/BonfireListener.kt b/src/main/kotlin/com/mineinabyss/bonfire/listeners/BonfireListener.kt
@@ -156,6 +156,8 @@ class BonfireListener : Listener {
         if (!entity.isDead) return
         val bonfireData = (entity as? ItemDisplay)?.toGearyOrNull()?.get<Bonfire>() ?: return
 
+        BlockyFurnitures.removeFurniture(entity as ItemDisplay)
+
         bonfireData.bonfirePlayers.map { it.toOfflinePlayer() }.forEach { p ->
             val onlinePlayer = p.player
             if (onlinePlayer != null) {
@@ -170,7 +172,5 @@ class BonfireListener : Listener {
                 }
             }
         }
-
-        BlockyFurnitures.removeFurniture(entity as ItemDisplay)
     }
 }