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

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

1 files changed, 5 insertions, 1 deletions

diff --git a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
index 5c8605fb..f3415a41 100644
--- a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
+++ b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
@@ -11,8 +11,9 @@ public:
 	// Common player interface
 	NetworkPlayerSony(SQRNetworkPlayer *sqrPlayer);
 	virtual unsigned char GetSmallId();
-	virtual void SendData(INetworkPlayer *player, const void *pvData, int dataSize, bool lowPriority);
+	virtual void SendData(INetworkPlayer *player, const void *pvData, int dataSize, bool lowPriority, bool ack);
 	virtual bool IsSameSystem(INetworkPlayer *player);
+	virtual int GetOutstandingAckCount();
 	virtual int GetSendQueueSizeBytes( INetworkPlayer *player, bool lowPriority );
 	virtual int GetSendQueueSizeMessages( INetworkPlayer *player, bool lowPriority );
 	virtual int GetCurrentRtt();
@@ -33,7 +34,10 @@ public:
 
 	void SetUID(PlayerUID UID);
 
+	virtual void SentChunkPacket();
+	virtual int GetTimeSinceLastChunkPacket_ms();
 private:
 	SQRNetworkPlayer *m_sqrPlayer;
 	Socket *m_pSocket;
+	__int64 m_lastChunkPacketTime;
 };