fix: Fixed connection resetting when packet merging is disabled

MidLevel · Dec 11, 2019 · 27ac220 · 27ac220
1 parent fafe3a6
commit 27ac220
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Ruffles/Connections/Connection.cs b/Ruffles/Connections/Connection.cs
@@ -334,7 +334,12 @@ internal void Reset()
             HandshakeResendAttempts = 0;
 
             HeartbeatChannel.Reset();
-            Merger.Clear();
+
+            if (Merger != null)
+            {
+                // Merger can be null if you
+                Merger.Clear();
+            }
 
             PreConnectionChallengeTimestamp = 0;
             PreConnectionChallengeCounter = 0;