fix: Fixed last packet resend not given enough time

MidLevel · Dec 18, 2019 · ffefe21 · ffefe21
1 parent 343c8dc
commit ffefe21
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/Ruffles/Channeling/Channels/ReliableSequencedFragmentedChannel.cs b/Ruffles/Channeling/Channels/ReliableSequencedFragmentedChannel.cs
@@ -609,14 +609,15 @@ public void InternalUpdate()
                         {
                             if (_sendSequencer[i].Fragments.Pointers[j] != null && ((PendingOutgoingFragment)_sendSequencer[i].Fragments.Pointers[j]).Alive)
                             {
-                                if (((PendingOutgoingFragment)_sendSequencer[i].Fragments.Pointers[j]).Attempts > config.ReliabilityMaxResendAttempts)
-                                {
-                                    // If they don't ack the message, disconnect them
-                                    connection.Disconnect(false);
-                                    return;
-                                }
-                                else if ((NetTime.Now - ((PendingOutgoingFragment)_sendSequencer[i].Fragments.Pointers[j]).LastSent).TotalMilliseconds > connection.SmoothRoundtrip * config.ReliabilityResendRoundtripMultiplier && (NetTime.Now - ((PendingOutgoingFragment)_sendSequencer[i].Fragments.Pointers[j]).LastSent).TotalMilliseconds > config.ReliabilityMinPacketResendDelay)
+                                if ((NetTime.Now - ((PendingOutgoingFragment)_sendSequencer[i].Fragments.Pointers[j]).LastSent).TotalMilliseconds > connection.SmoothRoundtrip * config.ReliabilityResendRoundtripMultiplier && (NetTime.Now - ((PendingOutgoingFragment)_sendSequencer[i].Fragments.Pointers[j]).LastSent).TotalMilliseconds > config.ReliabilityMinPacketResendDelay)
                                 {
+                                    if (((PendingOutgoingFragment)_sendSequencer[i].Fragments.Pointers[j]).Attempts > config.ReliabilityMaxResendAttempts)
+                                    {
+                                        // If they don't ack the message, disconnect them
+                                        connection.Disconnect(false);
+                                        return;
+                                    }
+
                                     _sendSequencer[i].Fragments.Pointers[j] = new PendingOutgoingFragment()
                                     {
                                         Alive = true,