From 3e4446e46b56eb3688491b7cd601b88fe5038237 Mon Sep 17 00:00:00 2001
From: Edward Richardson <Edward850@crantime.org>
Date: Mon, 13 Oct 2014 16:49:53 +1300
Subject: [PATCH] Moved prediction lerp reset to cover all cases.

---
 src/g_game.cpp | 6 ------
 src/p_mobj.cpp | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/g_game.cpp b/src/g_game.cpp
index 9020f2da1..95b0f587d 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -1635,12 +1635,6 @@ void G_DoReborn (int playernum, bool freshbot)
 	}
 	else
 	{
-		// Old lerp data needs to go
-		if (playernum == consoleplayer)
-		{
-			P_PredictionLerpReset();
-		}
-
 		// respawn at the start
 		// first disassociate the corpse
 		if (players[playernum].mo)
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index d035e0117..1d97311eb 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -4246,6 +4246,12 @@ APlayerPawn *P_SpawnPlayer (FPlayerStart *mthing, int playernum, int flags)
 	if ((unsigned)playernum >= (unsigned)MAXPLAYERS || !playeringame[playernum])
 		return NULL;
 
+	// Old lerp data needs to go
+	if (playernum == consoleplayer)
+	{
+		P_PredictionLerpReset();
+	}
+
 	p = &players[playernum];
 
 	if (p->cls == NULL)