From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 15 Apr 2011 21:29:38 +0000 (+0300)
Subject: Do it AFTER setting the new player origin, else the issue still happens
X-Git-Tag: xonotic-v0.5.0~148^2~37^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44a728d415b656dc8def88daf949d0a56533dfc5;p=xonotic%2Fxonotic-data.pk3dir.git

Do it AFTER setting the new player origin, else the issue still happens
---

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)
 		{