Added score sync state packet and lowered the frequency of sync state…

… packets
BeatTogether · May 14, 2024 · e251152 · e251152
1 parent 3628d6b
commit e251152
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 14 deletions.
diff --git a/BeatTogether.DedicatedServer.Kernel/Abstractions/IPlayerRegistry.cs b/BeatTogether.DedicatedServer.Kernel/Abstractions/IPlayerRegistry.cs
@@ -12,7 +12,8 @@ public interface IPlayerRegistry
         bool TryGetPlayer(EndPoint remoteEndPoint, [MaybeNullWhen(false)] out IPlayer player);
         bool TryGetPlayer(byte connectionId, [MaybeNullWhen(false)] out IPlayer player);
         bool TryGetPlayer(string userId, [MaybeNullWhen(false)] out IPlayer player);
-        int GetMillisBetweenSyncStatePackets();
+        long GetMillisBetweenPoseSyncStateDeltaPackets();
+        long GetMillisBetweenScoreSyncStateDeltaPackets();
 
         public void AddExtraPlayerSessionData(Core.Abstractions.IPlayer playerSessionData);
         public bool RemoveExtraPlayerSessionDataAndApply(Core.Abstractions.IPlayer playerSessionData/*out string ClientVersion, out byte Platform, out string PlayerPlatformUserId*/);

diff --git a/BeatTogether.DedicatedServer.Kernel/DedicatedInstance.cs b/BeatTogether.DedicatedServer.Kernel/DedicatedInstance.cs
@@ -379,9 +379,14 @@ public override void OnConnect(EndPoint endPoint)
                 },
                 new MpNodePoseSyncStatePacket
                 {
-                    fullStateUpdateFrequency = 100L,
-                    deltaUpdateFrequency = _playerRegistry.GetMillisBetweenSyncStatePackets()
+                    fullStateUpdateFrequency = Math.Max(_playerRegistry.GetMillisBetweenPoseSyncStateDeltaPackets(), 100L),
+                    deltaUpdateFrequency = _playerRegistry.GetMillisBetweenPoseSyncStateDeltaPackets()
                 },
+                new MpScoreSyncStatePacket
+                {
+                    fullStateUpdateFrequency = Math.Max(_playerRegistry.GetMillisBetweenScoreSyncStateDeltaPackets(), 500L),
+                    deltaUpdateFrequency = _playerRegistry.GetMillisBetweenScoreSyncStateDeltaPackets()
+                }
             }, IgnoranceChannelTypes.Reliable);
 
             //Send server infomation to player
@@ -417,9 +422,14 @@ public override void OnConnect(EndPoint endPoint)
                     },
                 new MpNodePoseSyncStatePacket
                     {
-                        fullStateUpdateFrequency = 100L,
-                        deltaUpdateFrequency = _playerRegistry.GetMillisBetweenSyncStatePackets()
+                        fullStateUpdateFrequency = Math.Max(_playerRegistry.GetMillisBetweenPoseSyncStateDeltaPackets(), 100L),
+                        deltaUpdateFrequency = _playerRegistry.GetMillisBetweenPoseSyncStateDeltaPackets()
                     },
+                new MpScoreSyncStatePacket
+                    {
+                        fullStateUpdateFrequency = Math.Max(_playerRegistry.GetMillisBetweenScoreSyncStateDeltaPackets(), 500L),
+                        deltaUpdateFrequency = _playerRegistry.GetMillisBetweenScoreSyncStateDeltaPackets()
+                    }
                };
 
             PacketDispatcher.SendToPlayer(player, Player_ConnectPacket, IgnoranceChannelTypes.Reliable);
@@ -572,10 +582,17 @@ public override void OnDisconnect(EndPoint endPoint)
                     // Update permissions
                     SetNewServerOwner(_playerRegistry.Players[0]);
                 }
-                PacketDispatcher.SendToNearbyPlayers(new MpNodePoseSyncStatePacket
-                {
-                    fullStateUpdateFrequency = 100L,
-                    deltaUpdateFrequency = _playerRegistry.GetMillisBetweenSyncStatePackets()
+                PacketDispatcher.SendToNearbyPlayers(new INetSerializable[] {
+                    new MpNodePoseSyncStatePacket
+                        {
+                            fullStateUpdateFrequency = Math.Max(_playerRegistry.GetMillisBetweenPoseSyncStateDeltaPackets(), 100L),
+                            deltaUpdateFrequency = _playerRegistry.GetMillisBetweenPoseSyncStateDeltaPackets()
+                        },
+                    new MpScoreSyncStatePacket
+                        {
+                            fullStateUpdateFrequency = Math.Max(_playerRegistry.GetMillisBetweenScoreSyncStateDeltaPackets(), 500L),
+                            deltaUpdateFrequency = _playerRegistry.GetMillisBetweenScoreSyncStateDeltaPackets()
+                        }
                 }, IgnoranceChannelTypes.Reliable);
             }
             else

diff --git a/BeatTogether.DedicatedServer.Kernel/PlayerRegistry.cs b/BeatTogether.DedicatedServer.Kernel/PlayerRegistry.cs
@@ -76,7 +76,8 @@ public bool AddPlayer(IPlayer player)
                     _playersByRemoteEndPoint.TryAdd(player.Endpoint, player);
                     _playersByConnectionId.TryAdd(player.ConnectionId, player);
                     _PlayerCount++;
-                     MillisBetweenSyncStatePackets = (int)(0.84 * _PlayerCount + 15.789);
+                    MillisBetweenPoseSyncStatePackets = (long)(0.94 * _PlayerCount + 15);
+                    MillisBetweenScoreSyncStatePackets = (long)(1.5 * _PlayerCount + 20);
                     return true;
                 }
             }
@@ -92,7 +93,8 @@ public void RemovePlayer(IPlayer player)
                     _playersByRemoteEndPoint.Remove(player.Endpoint, out _);
                     _playersByConnectionId.Remove(player.ConnectionId, out _);
                     _PlayerCount--;
-                    MillisBetweenSyncStatePackets = (int)(0.84 * _PlayerCount + 15.789);
+                    MillisBetweenPoseSyncStatePackets = (long)(0.94 * _PlayerCount + 15);
+                    MillisBetweenScoreSyncStatePackets = (long)(1.5 * _PlayerCount + 20);
                 }
             }
         }
@@ -119,10 +121,18 @@ public bool TryGetPlayer(string userId, [MaybeNullWhen(false)] out IPlayer playe
             }
         }
 
-        private int MillisBetweenSyncStatePackets = 0;
-        public int GetMillisBetweenSyncStatePackets()
+
+
+        private long MillisBetweenPoseSyncStatePackets = 0;
+        public long GetMillisBetweenPoseSyncStateDeltaPackets()
+        {
+            return MillisBetweenPoseSyncStatePackets;
+        }
+
+        private long MillisBetweenScoreSyncStatePackets = 0;
+        public long GetMillisBetweenScoreSyncStateDeltaPackets()
         {
-            return MillisBetweenSyncStatePackets;
+            return MillisBetweenScoreSyncStatePackets;
         }
     }
 }
diff --git a/...icatedServer.Messaging/Packets/MultiplayerSession/MpCorePackets/MpScoreSyncStatePacket.cs b/...icatedServer.Messaging/Packets/MultiplayerSession/MpCorePackets/MpScoreSyncStatePacket.cs
@@ -0,0 +1,24 @@
+using BeatTogether.Extensions;
+using BeatTogether.DedicatedServer.Messaging.Abstractions;
+using BeatTogether.DedicatedServer.Messaging.Util;
+
+namespace BeatTogether.DedicatedServer.Messaging.Packets.MultiplayerSession.MpCorePackets
+{
+    public sealed class MpScoreSyncStatePacket : INetSerializable
+    {
+        public long deltaUpdateFrequency;
+        public long fullStateUpdateFrequency;
+
+        public void WriteTo(ref SpanBuffer bufferWriter)
+        {
+            bufferWriter.WriteVarLong(deltaUpdateFrequency);
+            bufferWriter.WriteVarLong(fullStateUpdateFrequency);
+        }
+        public void ReadFrom(ref SpanBuffer bufferReader)
+        {
+            deltaUpdateFrequency = bufferReader.ReadVarLong();
+            fullStateUpdateFrequency = bufferReader.ReadVarLong();
+        }
+    }
+
+}