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

network: fix some null in pre-flattening versions

Browse Source
This commit is contained in:
Bixilon 2023-03-21 20:44:53 +01:00
parent a0736183aa
commit 823cd21a07
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityPlayerS2CP.kt
View File

@ -52,7 +52,7 @@ class EntityPlayerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val rotation = buffer.readEntityRotation() val rotation = buffer.readEntityRotation()
if (buffer.versionId < ProtocolVersions.V_15W31A) { if (buffer.versionId < ProtocolVersions.V_15W31A) {
buffer.connection.registries.item[buffer.readUnsignedShort()] // current item buffer.connection.registries.item.getOrNull(buffer.readUnsignedShort()) // current item
} }
var data: Int2ObjectOpenHashMap<Any?>? = null var data: Int2ObjectOpenHashMap<Any?>? = null

13
src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt
View File

@ -141,20 +141,21 @@ class PlayInByteBuffer : InByteBuffer {
fun readItemStack(): ItemStack? { fun readItemStack(): ItemStack? {
if (versionId < V_1_13_2_PRE1) { if (versionId < V_1_13_2_PRE1) {
val id = readShort().toInt() val id = readShort().toInt()
if (id == -1) { if (id <= 0) {
return null return null
} }
val count = readUnsignedByte() val count = readUnsignedByte()
var metaData = 0 var meta = 0
if (!connection.version.flattened) { if (!connection.version.flattened) {
metaData = readUnsignedShort() meta = readUnsignedShort()
} }
val nbt = readNBT()?.toMutableJsonObject() val nbt = readNBTTag()?.toMutableJsonObject()
val item = connection.registries.item.getOrNull(id shl 16 or meta) ?: return null
return ItemStackUtil.of( return ItemStackUtil.of(
item = connection.registries.item[id shl 16 or metaData], item = item,
connection = connection, connection = connection,
count = count, count = count,
durability = metaData, durability = meta,
nbt = nbt ?: mutableMapOf(), nbt = nbt ?: mutableMapOf(),
) )
} }

4
src/main/java/de/bixilon/minosoft/protocol/versions/Version.kt
View File

@ -59,6 +59,10 @@ class Version(
PacketDirections.SERVER_TO_CLIENT -> s2c PacketDirections.SERVER_TO_CLIENT -> s2c
} }
operator fun compareTo(version: Version): Int {
return this.versionId.compareTo(version.versionId)
}
val flattened: Boolean get() = versionId >= V_17W47A val flattened: Boolean get() = versionId >= V_17W47A
val hasOffhand: Boolean get() = versionId >= V_15W31A val hasOffhand: Boolean get() = versionId >= V_15W31A
val maxPacketLength get() = if (versionId < V_1_17_1_RC2) 1 shl 21 else 1 shl 23 val maxPacketLength get() = if (versionId < V_1_17_1_RC2) 1 shl 21 else 1 shl 23