Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.World/ComplexItemDataPacket.cpp b/Minecraft.World/ComplexItemDataPacket.cpp
index 4c365bbd..38c39cb6 100644
--- a/Minecraft.World/ComplexItemDataPacket.cpp
+++ b/Minecraft.World/ComplexItemDataPacket.cpp
@@ -32,7 +32,7 @@ void ComplexItemDataPacket::read(DataInputStream *dis) //throws IOException
 	itemType = dis->readShort();
 	itemId = dis->readShort();
 
-	data = charArray(dis->readShort() & 0xffff);
+	data = charArray(dis->readUnsignedShort() & 0xffff);
 	dis->readFully(data);
 }
 
@@ -40,7 +40,7 @@ void ComplexItemDataPacket::write(DataOutputStream *dos) //throws IOException
 {
 	dos->writeShort(itemType);
 	dos->writeShort(itemId);
-	dos->writeShort(data.length);
+	dos->writeUnsignedShort(data.length);
 
 	byteArray ba( (byte*)data.data, data.length );
 	dos->write(ba);