From 3d86e7135dcf7cbdc1dfa9759847a7cde7a064bf Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Thu, 1 Jun 2017 19:01:57 +0100
Subject: [PATCH 1/3] Fix confusion between nodes and players in ping updating
 code and PT_PING packet sending code

---
 src/d_clisrv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 312a308a1..1f83b8dab 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4529,8 +4529,8 @@ static inline void PingUpdate(void)
 	}
 
 	//send out our ping packets
-	for (i = 0; i < MAXPLAYERS; i++)
-		if (playeringame[i])
+	for (i = 0; i < MAXNETNODES; i++)
+		if (nodeingame[i])
 			HSendPacket(i, true, 0, sizeof(INT32) * MAXPLAYERS);
 
 	pingmeasurecount = 1; //Reset count
@@ -4571,9 +4571,9 @@ void NetUpdate(void)
 	if (server)
 	{
 		// update node latency values so we can take an average later.
-		for (i = 0; i < MAXNETNODES; i++)
+		for (i = 0; i < MAXPLAYERS; i++)
 			if (playeringame[i])
-				realpingtable[i] += G_TicsToMilliseconds(GetLag(i));
+				realpingtable[i] += G_TicsToMilliseconds(GetLag(playernode[i]));
 		pingmeasurecount++;
 	}
 #endif

From fe15305df0b78b5ce3ccb45cf12277ea574907d7 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Thu, 1 Jun 2017 20:43:24 +0100
Subject: [PATCH 2/3] Merge the two NEWPING parts of NetUpdate into one block

---
 src/d_clisrv.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 1f83b8dab..bf5bca2f5 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4560,16 +4560,11 @@ void NetUpdate(void)
 
 	gametime = nowtime;
 
-	if (!(gametime % 255) && netgame && server)
-	{
-#ifdef NEWPING
-		PingUpdate();
-#endif
-	}
-
 #ifdef NEWPING
 	if (server)
 	{
+		if (netgame && !(gametime % 255))
+			PingUpdate();
 		// update node latency values so we can take an average later.
 		for (i = 0; i < MAXPLAYERS; i++)
 			if (playeringame[i])

From 2e42c9621c6c18badfe8020843701f8cadbfddb2 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Thu, 1 Jun 2017 20:46:44 +0100
Subject: [PATCH 3/3] Eck, potted another node/player confusion for clients
 reciving PT_PING

---
 src/d_clisrv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index bf5bca2f5..43b684e10 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3971,7 +3971,7 @@ FILESTAMP
 			if (client)
 			{
 				INT32 i;
-				for (i = 0; i < MAXNETNODES; i++)
+				for (i = 0; i < MAXPLAYERS; i++)
 					if (playeringame[i])
 						playerpingtable[i] = (tic_t)netbuffer->u.pingtable[i];
 			}