AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 09:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

block entity receiving: don't process empty nbt

Browse Source
This commit is contained in:
Moritz Zwerger 2025-02-06 22:11:43 +01:00
parent 2e202bd6fc
commit f1596c53ff
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/bixilon/minosoft/data/world/chunk/chunk/ChunkPrototype.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2024 Moritz Zwerger * Copyright (C) 2020-2025 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -101,6 +101,7 @@ class ChunkPrototype(
} }
private fun Map<Vec3i, JsonObject>?.update(minSection: Int, chunk: Chunk, affected: IntOpenHashSet?, session: PlaySession) { private fun Map<Vec3i, JsonObject>?.update(minSection: Int, chunk: Chunk, affected: IntOpenHashSet?, session: PlaySession) {
val empty = isNullOrEmpty()
val position = Vec3i() val position = Vec3i()
for ((index, section) in chunk.sections.withIndex()) { for ((index, section) in chunk.sections.withIndex()) {
if (section == null || section.blocks.isEmpty) continue if (section == null || section.blocks.isEmpty) continue
@ -123,7 +124,9 @@ class ChunkPrototype(
entity = block.createBlockEntity(session) ?: continue entity = block.createBlockEntity(session) ?: continue
section.blockEntities[index] = entity section.blockEntities[index] = entity
} }
this?.get(position)?.let { entity.updateNBT(it) } if (!empty) {
this!![position]?.let { entity.updateNBT(it) }
}
affected?.add(sectionHeight) affected?.add(sectionHeight)
} }
} }

6
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkS2CP.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2024 Moritz Zwerger * Copyright (C) 2020-2025 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -118,7 +118,7 @@ class ChunkS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
if (versionId < V_1_9_4) return null if (versionId < V_1_9_4) return null
val count = readVarInt() val count = readVarInt()
if (count <= 0) return null if (count <= 0) return null
val entities: MutableMap<Vec3i, JsonObject> = hashMapOf() val entities: MutableMap<Vec3i, JsonObject> = HashMap(count)
when { when {
versionId < V_21W37A -> { versionId < V_21W37A -> {
@ -127,6 +127,7 @@ class ChunkS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val nbt = readNBT()?.asJsonObject() ?: continue val nbt = readNBT()?.asJsonObject() ?: continue
val position = Vec3i(nbt["x"]?.toInt() ?: continue, nbt["y"]?.toInt() ?: continue, nbt["z"]?.toInt() ?: continue) - positionOffset val position = Vec3i(nbt["x"]?.toInt() ?: continue, nbt["y"]?.toInt() ?: continue, nbt["z"]?.toInt() ?: continue) - positionOffset
val id = (nbt["id"]?.toResourceLocation() ?: continue).fixBlockEntity() val id = (nbt["id"]?.toResourceLocation() ?: continue).fixBlockEntity()
if (nbt.size <= 4) continue // no additional data
val type = session.registries.blockEntityType[id] ?: continue val type = session.registries.blockEntityType[id] ?: continue
entities[position] = nbt entities[position] = nbt
@ -139,6 +140,7 @@ class ChunkS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val y = readShort() val y = readShort()
val type = session.registries.blockEntityType.getOrNull(readVarInt()) val type = session.registries.blockEntityType.getOrNull(readVarInt())
val nbt = readNBT()?.asJsonObject() ?: continue val nbt = readNBT()?.asJsonObject() ?: continue
if (nbt.isEmpty()) continue
if (type == null) continue if (type == null) continue
entities[Vec3i(xz shr 4, y, xz and 0x0F)] = nbt entities[Vec3i(xz shr 4, y, xz and 0x0F)] = nbt