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 c47ea5d207ef8eda0a0ccd80d293c3085b55475e..50f149ece22f2914aea7135768698b554b73a4fb 100644 (file)
--- 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)
                {