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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/Minecraft.World/ContainerClickPacket.cpp b/Minecraft.World/ContainerClickPacket.cpp
index 5b3ca24f..a9712183 100644
--- a/Minecraft.World/ContainerClickPacket.cpp
+++ b/Minecraft.World/ContainerClickPacket.cpp
@@ -18,16 +18,16 @@ ContainerClickPacket::ContainerClickPacket()
 	buttonNum = 0;
 	uid = 0;
 	item = nullptr;
-	quickKey = false;
+	clickType = 0;
 }
 
-ContainerClickPacket::ContainerClickPacket(int containerId, int slotNum, int buttonNum, bool quickKey, shared_ptr<ItemInstance> item, short uid)
+ContainerClickPacket::ContainerClickPacket(int containerId, int slotNum, int buttonNum, int clickType, shared_ptr<ItemInstance> item, short uid)
 {
 	this->containerId = containerId;
 	this->slotNum = slotNum;
 	this->buttonNum = buttonNum;
 	this->uid = uid;
-	this->quickKey = quickKey;
+	this->clickType = clickType;
 	// 4J - make a copy of the relevant bits of this item, as we want our packets to have full ownership of any data they reference
 	this->item = item ? item->copy() : nullptr;
 }
@@ -43,7 +43,7 @@ void ContainerClickPacket::read(DataInputStream *dis) //throws IOException
 	slotNum = dis->readShort();
 	buttonNum = dis->readByte();
 	uid = dis->readShort();
-	quickKey = dis->readBoolean();
+	clickType = dis->readByte();
 
 	item = readItem(dis);
 }
@@ -54,7 +54,7 @@ void ContainerClickPacket::write(DataOutputStream *dos) // throws IOException
 	dos->writeShort(slotNum);
 	dos->writeByte(buttonNum);
 	dos->writeShort(uid);
-	dos->writeBoolean(quickKey);
+	dos->writeByte(clickType);
 
 	writeItem(item, dos);
 }