fix flatbuffers not handled correctly

stayintarkov · Apr 21, 2024 · ab3f5bb · ab3f5bb
1 parent f5142a2
commit ab3f5bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Source/Coop/Components/CoopGameComponents/SITGameComponent.cs b/Source/Coop/Components/CoopGameComponents/SITGameComponent.cs
@@ -321,15 +321,13 @@ private IEnumerator SendPlayerStatePacket()
 
                 builder.Finish(packetOffset.Value);
 
-                // NOTE(belette) Abstraction zealots in shambles, we never needed inheritance, we had if and switch all along, we can see what's happening inline IDONTWANNAHEARIT
                 if (Singleton<ISITGame>.Instance.GameClient is GameClientUDP udp)
                 {
                     var seg = builder.DataBuffer.ToArraySegment(builder.DataBuffer.Position, builder.DataBuffer.Length - builder.DataBuffer.Position);
                     udp.SendData(seg.Array, seg.Offset, seg.Count, SITGameServerClientDataProcessing.FLATBUFFER_CHANNEL_NUM, LiteNetLib.DeliveryMethod.Sequenced);
                 }
-                else if (Singleton<ISITGame>.Instance.GameClient is GameClientTCPRelay relay)
+                else if (Singleton<ISITGame>.Instance.GameClient is GameClientTCPRelay)
                 {
-                    // TODO(belette) fix TCP Relay recipient side to detect FlatBuffers and process as such
                     GameClient.SendData(builder.SizedByteArray());
                 }
             }

diff --git a/Source/Networking/GameClientUDP.cs b/Source/Networking/GameClientUDP.cs
@@ -178,8 +178,15 @@ public void ResetStats()
 
         void INetEventListener.OnNetworkReceive(NetPeer peer, NetPacketReader reader, byte channelNumber, DeliveryMethod deliveryMethod)
         {
-            var bytes = reader.GetRemainingBytes();
-            Singleton<SITGameServerClientDataProcessing>.Instance.ProcessPacketBytes(bytes);
+            if (channelNumber == SITGameServerClientDataProcessing.FLATBUFFER_CHANNEL_NUM)
+            {
+                Singleton<SITGameServerClientDataProcessing>.Instance.ProcessFlatBuffer(reader.GetRemainingBytes());
+            }
+            else
+            {
+                var bytes = reader.GetRemainingBytes();
+                Singleton<SITGameServerClientDataProcessing>.Instance.ProcessPacketBytes(bytes);
+            }
         }
 
         void OnDestroy()
@@ -282,9 +289,6 @@ public void SendData(byte[] data)
             SendData(data, 0, data.Length, 0, LiteNetLib.DeliveryMethod.ReliableOrdered);
         }
 
-
-        // Send(byte[] data, int start, int length, byte channelNumber, DeliveryMethod deliveryMethod)
-
         public void SendData<T>(ref T packet) where T : BasePacket
         {
             using NetDataWriter writer = new NetDataWriter();

diff --git a/Source/Networking/SITGameServerClientDataProcessing.cs b/Source/Networking/SITGameServerClientDataProcessing.cs
@@ -25,9 +25,6 @@ namespace StayInTarkov.Networking
 {
     public class SITGameServerClientDataProcessing : NetworkBehaviour
     {
-        public const string PACKET_TAG_METHOD = "m";
-        public const string PACKET_TAG_SERVERID = "serverId";
-        public const string PACKET_TAG_DATA = "data";
         public const byte FLATBUFFER_CHANNEL_NUM = 1;
         public event Action<ushort> OnLatencyUpdated;
         private SITGameComponent SITGameComponent { get; set; }