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

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

1 files changed, 9 insertions, 2 deletions

diff --git a/Minecraft.World/ClientInformationPacket.h b/Minecraft.World/ClientInformationPacket.h
index e5e2cc42..e9d73a5d 100644
--- a/Minecraft.World/ClientInformationPacket.h
+++ b/Minecraft.World/ClientInformationPacket.h
@@ -14,12 +14,13 @@ class ClientInformationPacket : public Packet
 	public ClientInformationPacket() {
 	}
 
-	public ClientInformationPacket(String language, int viewDistance, int chatVisibility, boolean chatColors, int difficulty) {
+	public ClientInformationPacket(String language, int viewDistance, int chatVisibility, boolean chatColors, int difficulty, boolean showCape) {
 		this.language = language;
 		this.viewDistance = viewDistance;
 		this.chatVisibility = chatVisibility;
 		this.chatColors = chatColors;
 		this.difficulty = difficulty;
+        this.showCape = showCape;
 	}
 
 	@Override
@@ -32,6 +33,7 @@ class ClientInformationPacket : public Packet
 			chatColors = (chat & 0x8) == 0x8;
 
 			difficulty = dis.readByte();
+        showCape = dis.readBoolean();
 	}
 
 	@Override
@@ -40,6 +42,7 @@ class ClientInformationPacket : public Packet
 			dos.writeByte(viewDistance);
 			dos.writeByte(chatVisibility | (chatColors ? 1 : 0) << 3);
 			dos.writeByte(difficulty);
+        dos.writeBoolean(showCape);
 	}
 
 	@Override
@@ -49,7 +52,7 @@ class ClientInformationPacket : public Packet
 
 	@Override
 		public int getEstimatedSize() {
-			return 0;
+			return 7;
 	}
 
 	public String getLanguage() {
@@ -72,6 +75,10 @@ class ClientInformationPacket : public Packet
 		return difficulty;
 	}
 
+    public boolean getShowCape() {
+        return showCape;
+    }
+
 	public void setDifficulty(int difficulty) {
 		this.difficulty = difficulty;
 	}