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

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

1 files changed, 5 insertions, 9 deletions

diff --git a/Minecraft.World/PlayerInputPacket.h b/Minecraft.World/PlayerInputPacket.h
index 8bc11d3e..bc2d3985 100644
--- a/Minecraft.World/PlayerInputPacket.h
+++ b/Minecraft.World/PlayerInputPacket.h
@@ -7,26 +7,22 @@ class PlayerInputPacket : public Packet, public enable_shared_from_this<PlayerIn
 {
 
 private:
-	float xa;
-    float ya;
+	float xxa;
+    float yya;
     bool isJumpingVar;
     bool isSneakingVar;
-    float xRot;
-    float yRot;
 
 public:
 	PlayerInputPacket();
-	PlayerInputPacket(float xa, float ya, bool isJumpingVar, bool isSneakingVar, float xRot, float yRot);
+	PlayerInputPacket(float xxa, float yya, bool isJumpingVar, bool isSneakingVar);
 
 	virtual void read(DataInputStream *dis);
 	virtual void write(DataOutputStream *dos);
 	virtual void handle(PacketListener *listener);
 	virtual int getEstimatedSize();
 
-	float getXa();
-	float getXRot();
-	float getYa();
-	float getYRot();
+	float getXxa();
+	float getYya();
 	bool isJumping();
 	bool isSneaking();