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

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

1 files changed, 14 insertions, 1 deletions

diff --git a/Minecraft.World/PlayerCommandPacket.cpp b/Minecraft.World/PlayerCommandPacket.cpp
index 6aecc0e6..72e34c80 100644
--- a/Minecraft.World/PlayerCommandPacket.cpp
+++ b/Minecraft.World/PlayerCommandPacket.cpp
@@ -14,30 +14,43 @@ const int PlayerCommandPacket::START_SPRINTING =	4;
 const int PlayerCommandPacket::STOP_SPRINTING =		5;
 const int PlayerCommandPacket::START_IDLEANIM =		6;
 const int PlayerCommandPacket::STOP_IDLEANIM =		7;
+const int PlayerCommandPacket::RIDING_JUMP =		8;
+const int PlayerCommandPacket::OPEN_INVENTORY =		9;
 
 
 PlayerCommandPacket::PlayerCommandPacket()
 {
 	id = -1;
 	action = 0;
+	data = 0;
 }
 
 PlayerCommandPacket::PlayerCommandPacket(shared_ptr<Entity> e, int action)
 {
 	id = e->entityId;
 	this->action = action;
+	this->data = 0;
+}
+
+PlayerCommandPacket::PlayerCommandPacket(shared_ptr<Entity> e, int action, int data)
+{
+	id = e->entityId;
+	this->action = action;
+	this->data = data;
 }
 
 void PlayerCommandPacket::read(DataInputStream *dis) //throws IOException 
 {
 	id = dis->readInt();
 	action = dis->readByte();
+	data = dis->readInt();
 }
 
 void PlayerCommandPacket::write(DataOutputStream *dos) //throws IOException 
 {
 	dos->writeInt(id);
 	dos->writeByte(action);
+	dos->writeInt(data);
 }
 
 void PlayerCommandPacket::handle(PacketListener *listener)
@@ -47,5 +60,5 @@ void PlayerCommandPacket::handle(PacketListener *listener)
 
 int PlayerCommandPacket::getEstimatedSize() 
 {
-	return 5;
+	return 9;
 }