From b7a84f9dfac563e2a8529f3fdc7986e078d1c6e6 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sun, 23 Oct 2022 17:30:14 +0200 Subject: [PATCH] network: mark blocks as initialized if server sends empty chunk * This fixes a bug, that empty chunks (in custom worlds) are marked as not fully received --- .../protocol/network/connection/play/ConnectionUtil.kt | 2 +- src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt index c64fa2cdd..863b79a73 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt @@ -87,7 +87,7 @@ class ConnectionUtil( sendSignedMessage(privateKey, message) } - fun sendSignedMessage(privateKey: PrivateKey = connection.player.privateKey?.private!!, message: String) { + fun sendSignedMessage(privateKey: PrivateKey = connection.player.privateKey!!.private, message: String) { val salt = random.nextLong() val time = Instant.now() val uuid = connection.player.uuid diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt b/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt index 4732a55b5..8b9bfceb3 100644 --- a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt @@ -14,7 +14,6 @@ package de.bixilon.minosoft.util.chunk import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kutil.array.ArrayUtil.isEmptyOrOnlyNull import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.minosoft.config.StaticConfiguration import de.bixilon.minosoft.data.registries.biomes.Biome @@ -204,9 +203,7 @@ object ChunkUtil { } } - if (!sectionBlocks.isEmptyOrOnlyNull()) { - chunkData.blocks = sectionBlocks - } + chunkData.blocks = sectionBlocks if (lightReceived > 0) { chunkData.light = light }