Fix exception during packet handling

2024-07-24 15:34:10 +02:00
parent 0ea10aac31
commit a19d2e1e1b
1 changed files with 3 additions and 2 deletions
--- a/src/main/kotlin/moe/nea/firmament/apis/ingame/InGameCodecWrapper.kt
+++ b/src/main/kotlin/moe/nea/firmament/apis/ingame/InGameCodecWrapper.kt
@@ -36,8 +36,9 @@ class InGameCodecWrapper(
        val duplicateBuffer = PacketByteBuf(buf.slice())
        val original = wrapped.decode(buf)
        buf.skipBytes(buf.readableBytes())
-        val duplicate = direction.customCodec.decode(duplicateBuffer)
-        if (duplicate is FirmamentCustomPayload.Unhandled)
+        val duplicate = runCatching { direction.customCodec.decode(duplicateBuffer) }
+            .getOrNull()
+        if (duplicate is FirmamentCustomPayload.Unhandled || duplicate == null)
            return original
        return JoinedCustomPayload(original, duplicate)
    }