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

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

1 files changed, 22 insertions, 1 deletions

diff --git a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.cpp b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.cpp
index 37e24f7a..386a0206 100644
--- a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.cpp
+++ b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.cpp
@@ -12,7 +12,7 @@ unsigned char NetworkPlayerXbox::GetSmallId()
 	return m_qnetPlayer->GetSmallId();
 }
 
-void NetworkPlayerXbox::SendData(INetworkPlayer *player, const void *pvData, int dataSize, bool lowPriority)
+void NetworkPlayerXbox::SendData(INetworkPlayer *player, const void *pvData, int dataSize, bool lowPriority, bool ack)
 {
 	DWORD flags;
 	flags = QNET_SENDDATA_RELIABLE | QNET_SENDDATA_SEQUENTIAL;
@@ -20,6 +20,11 @@ void NetworkPlayerXbox::SendData(INetworkPlayer *player, const void *pvData, int
 	m_qnetPlayer->SendData(((NetworkPlayerXbox *)player)->m_qnetPlayer, pvData, dataSize, flags);
 }
 
+int NetworkPlayerXbox::GetOutstandingAckCount()
+{
+	return 0;
+}
+
 bool NetworkPlayerXbox::IsSameSystem(INetworkPlayer *player)
 {
 	return ( m_qnetPlayer->IsSameSystem(((NetworkPlayerXbox *)player)->m_qnetPlayer) == TRUE );
@@ -119,3 +124,19 @@ IQNetPlayer *NetworkPlayerXbox::GetQNetPlayer()
 	return m_qnetPlayer;
 }
 
+void NetworkPlayerXbox::SentChunkPacket()
+{
+	m_lastChunkPacketTime = System::currentTimeMillis();
+}
+
+int NetworkPlayerXbox::GetTimeSinceLastChunkPacket_ms()
+{
+	// If we haven't ever sent a packet, return maximum
+	if( m_lastChunkPacketTime == 0 )
+	{
+		return INT_MAX;
+	}
+
+	__int64 currentTime = System::currentTimeMillis();
+	return (int)( currentTime - m_lastChunkPacketTime );
+}
\ No newline at end of file