From 5857f9b92df44dbc44c2a1f45e09f9cbcae6f33b Mon Sep 17 00:00:00 2001
From: lidgren <lidgren@users.noreply.github.com>
Date: Sat, 26 Jun 2010 21:06:44 +0000
Subject: [PATCH] Reliability fix

---
 Lidgren.Network/NetConnection.Reliability.cs | 14 ++++++++++----
 Lidgren.Network/NetConnection.cs             |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Lidgren.Network/NetConnection.Reliability.cs b/Lidgren.Network/NetConnection.Reliability.cs
index 64b1b4a..f10eef3 100644
--- a/Lidgren.Network/NetConnection.Reliability.cs
+++ b/Lidgren.Network/NetConnection.Reliability.cs
@@ -62,8 +62,6 @@ namespace Lidgren.Network
 		{
 			int num = ((int)NetMessageType.UserReliableOrdered + NetConstants.NetChannelsPerDeliveryMethod) - (int)NetMessageType.UserSequenced;
 			m_nextSendSequenceNumber = new int[num];
-			for(int i=0;i<m_nextSendSequenceNumber.Length;i++)
-				m_nextSendSequenceNumber[i] = -1; // initialize to -1; pre-increment will start sending at 0
 			m_lastReceivedSequenced = new ushort[num];
 			m_nextForceAckTime = double.MaxValue;
 		}
@@ -71,7 +69,15 @@ namespace Lidgren.Network
 		internal ushort GetSendSequenceNumber(NetMessageType mtp)
 		{
 			int slot = (int)mtp - (int)NetMessageType.UserSequenced;
-			return (ushort)Interlocked.Increment(ref m_nextSendSequenceNumber[slot]);
+			int retval;
+			lock (m_nextSendSequenceNumber)
+			{
+				retval = m_nextSendSequenceNumber[slot];
+				if (retval == ushort.MaxValue)
+					retval = -1;
+				m_nextSendSequenceNumber[slot] = retval + 1;
+			}
+			return (ushort)retval;
 		}
 
 		internal static int Relate(int seqNr, int lastReceived)
@@ -181,7 +187,7 @@ namespace Lidgren.Network
 						m_lastSendRespondedTo = NetTime.Now; // TODO: calculate from send.NextResend and send.NumSends
 						int unfin = send.Message.m_numUnfinishedSendings;
 						send.Message.m_numUnfinishedSendings = unfin - 1;
-						if (unfin <= 1)
+						if (unfin <= 0)
 							m_owner.Recycle(send.Message); // every sent has been acked; free the message
 
 						m_unackedSends.Remove(send);
diff --git a/Lidgren.Network/NetConnection.cs b/Lidgren.Network/NetConnection.cs
index c0ebeaa..6215275 100644
--- a/Lidgren.Network/NetConnection.cs
+++ b/Lidgren.Network/NetConnection.cs
@@ -264,7 +264,7 @@ namespace Lidgren.Network
 					if (send.MessageType >= NetMessageType.UserReliableUnordered)
 					{
 						// store for reliability
-						if (send.NumSends == 0)
+						if (send.NumSends == 1)
 							m_unackedSends.Add(send);
 					}
 					else