Merge pull request #136 from 0blu/delay_when_not_able_to_send

Queue packets when "not connected" to instance
WowLegacyCore · Nov 29, 2022 · 4e03ecb · 4e03ecb
2 parents b27b7bb + 604adaf
commit 4e03ecb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/HermesProxy/GlobalSessionData.cs b/HermesProxy/GlobalSessionData.cs
@@ -40,6 +40,7 @@ public class GameSessionData
         public bool IsWaitingForNewWorld;
         public bool IsFirstEnterWorld;
         public bool IsConnectedToInstance;
+        public Queue<ServerPacket> PendingUninstancedPackets = new(); // Here packets are queued while IsConnectedToInstance = false;
         public bool IsInWorld;
         public uint? CurrentMapId;
         public uint CurrentZoneId;

diff --git a/HermesProxy/World/Client/WorldClient.cs b/HermesProxy/World/Client/WorldClient.cs
@@ -256,6 +256,7 @@ public void SendPacketToClient(ServerPacket packet, Opcode delayUntilOpcode = Op
 
         private void SendPacketToClientDirect(ServerPacket packet)
         {
+            var pendingPackets = GetSession().GameState.PendingUninstancedPackets;
             if (packet.GetConnection() == ConnectionType.Realm)
             {
                 GetSession().RealmSocket.SendPacket(packet);
@@ -265,17 +266,38 @@ private void SendPacketToClientDirect(ServerPacket packet)
                 if (GetSession().InstanceSocket == null &&
                    !GetSession().GameState.IsConnectedToInstance)
                 {
-                    Log.PrintNet(LogType.Error, LogNetDir.P2C, $"Can't send opcode {packet.GetUniversalOpcode()} ({packet.GetOpcode()}) before entering world!");
-                    return;
+                    lock (pendingPackets)
+                    {
+                        if (GetSession().InstanceSocket == null &&
+                            !GetSession().GameState.IsConnectedToInstance)
+                        {
+                            pendingPackets.Enqueue(packet);
+                            Log.PrintNet(LogType.Warn, LogNetDir.P2C, $"Can't send opcode {packet.GetUniversalOpcode()} ({packet.GetOpcode()}) before entering world! Queue");
+                            return;
+                        }
+                    }
                 }
 
                 // block these packets until connected to instance
                 while (GetSession().InstanceSocket == null)
                 {
                     Log.PrintNet(LogType.Network, LogNetDir.P2C, $"Waiting to send {packet.GetUniversalOpcode()} ({packet.GetOpcode()}).");
                     System.Threading.Thread.Sleep(200);
-                };
-                GetSession().InstanceSocket.SendPacket(packet);
+                }
+
+                var socket = GetSession().InstanceSocket;
+                if (pendingPackets.Count > 0)
+                {
+                    lock (pendingPackets)
+                    {
+                        while (pendingPackets.TryDequeue(out var oldPacket))
+                        {
+                            socket.SendPacket(oldPacket);
+                        }
+                    }
+                }
+
+                socket.SendPacket(packet);
             }
         }