From 44a728d415b656dc8def88daf949d0a56533dfc5 Mon Sep 17 00:00:00 2001
From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 16 Apr 2011 00:29:38 +0300
Subject: [PATCH] Do it AFTER setting the new player origin, else the issue
 still happens

---
 qcsrc/server/cl_client.qc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c47ea5d20..50f149ece 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -975,7 +975,6 @@ void PutClientInServer (void)
 		self.punchvector = '0 0 0';
 		self.oldvelocity = self.velocity;
 		self.fire_endtime = -1;
-		self.lastteleporttime = time;
 
 		msg_entity = self;
 		WRITESPECTATABLE_MSG_ONE({
@@ -998,6 +997,7 @@ void PutClientInServer (void)
 		self.oldorigin = self.origin;
 		self.prevorigin = self.origin;
 		self.lastrocket = world; // stop rocket guiding, no revenge from the grave!
+		self.lastteleporttime = time; // prevent insane speeds due to changing origin
 
 		if(g_arena)
 		{
-- 
2.39.2