hotfix: prevent chunk data loss when a single block fails to save

Author: LordIdra

rebar/src/main/kotlin/io/github/pylonmc/rebar/block/BlockStorage.kt

@@ -519,7 +519,7 @@ object BlockStorage : Listener {
     }
 
     private fun save(chunk: Chunk, chunkBlocks: MutableList<RebarBlock>) {
-        val serializedBlocks = chunkBlocks.map {
+        val serializedBlocks = chunkBlocks.mapNotNull {
             RebarBlock.serialize(it, chunk.persistentDataContainer.adapterContext)
         }
 
@@ -598,11 +598,9 @@ object BlockStorage : Listener {
                 null
             } else if (block.schema.key.isFromAddon(addon)) {
                 RebarBlockSchema.schemaCache[block.block.position] = PhantomBlock.schema
-                PhantomBlock(
-                    RebarBlock.serialize(block, block.block.chunk.persistentDataContainer.adapterContext),
-                    block.schema.key,
-                    block.block
-                )
+                RebarBlock.serialize(block, block.block.chunk.persistentDataContainer.adapterContext)?.let { pdc ->
+                    PhantomBlock(pdc, block.schema.key, block.block)
+                }
             } else {
                 null
             }
@@ -632,17 +630,15 @@ object BlockStorage : Listener {
     internal fun makePhantom(block: RebarBlock) = lockBlockWrite {
         BlockCullingEngine.remove(block)
         RebarBlockSchema.schemaCache[block.block.position] = PhantomBlock.schema
-        val phantomBlock = PhantomBlock(
-            RebarBlock.serialize(block, block.block.chunk.persistentDataContainer.adapterContext),
-            block.schema.key,
-            block.block
-        )
+        val pdc = RebarBlock.serialize(block, block.block.chunk.persistentDataContainer.adapterContext) ?: return
+        val phantomBlock = PhantomBlock(pdc, block.schema.key, block.block)
 
         blocks.replace(block.block.position, block, phantomBlock)
         blocksByKey[block.key]!!.remove(block)
         blocksByKey.computeIfAbsent(phantomBlock.key) { mutableListOf() }.add(phantomBlock)
         blocksByChunk[block.block.chunk.position]!!.remove(block)
         blocksByChunk[phantomBlock.block.chunk.position]!!.add(phantomBlock)
+        Unit
     }
 
     @JvmSynthetic

rebar/src/main/kotlin/io/github/pylonmc/rebar/block/RebarBlock.kt

@@ -355,20 +355,26 @@ open class RebarBlock private constructor(val block: Block) : Keyed {
         internal fun serialize(
             block: RebarBlock,
             context: PersistentDataAdapterContext
-        ): PersistentDataContainer {
-            // See PhantomBlock docs for why we do this
-            if (block is PhantomBlock) {
-                return block.pdc
-            }
+        ): PersistentDataContainer? {
+            return try {
+                // See PhantomBlock docs for why we do this
+                if (block is PhantomBlock) {
+                    return block.pdc
+                }
 
-            val pdc = context.newPersistentDataContainer()
-            pdc.set(rebarBlockKeyKey, RebarSerializers.NAMESPACED_KEY, block.schema.key)
-            pdc.set(rebarBlockPositionKey, RebarSerializers.LONG, block.block.position.asLong)
+                val pdc = context.newPersistentDataContainer()
+                pdc.set(rebarBlockKeyKey, RebarSerializers.NAMESPACED_KEY, block.schema.key)
+                pdc.set(rebarBlockPositionKey, RebarSerializers.LONG, block.block.position.asLong)
 
-            block.write(pdc)
-            RebarBlockSerializeEvent(block.block, block, pdc, false).callEvent()
+                block.write(pdc)
+                RebarBlockSerializeEvent(block.block, block, pdc, false).callEvent()
 
-            return pdc
+                pdc
+            } catch (e: Exception) {
+                Rebar.logger.severe { "Failed to save block at ${block.block.location} of type ${block.key}" }
+                e.printStackTrace()
+                null
+            }
         }
 
         @JvmSynthetic