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

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index d1fda906ce90b25d014d6172303e15fd9a700419..b5243b5ca6c6a1218d8839d752a6d78f49374ec9 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -913,7 +913,6 @@ void PutClientInServer (void)
                self.punchvector = '0 0 0';\r
                self.oldvelocity = self.velocity;\r
                self.fire_endtime = -1;\r
                self.punchvector = '0 0 0';\r
                self.oldvelocity = self.velocity;\r
                self.fire_endtime = -1;\r

-               self.lastteleporttime = time;\r

 \r
                msg_entity = self;\r
                WRITESPECTATABLE_MSG_ONE({\r
 \r
                msg_entity = self;\r
                WRITESPECTATABLE_MSG_ONE({\r


@@ -937,6 +936,7 @@ void PutClientInServer (void)
                self.oldorigin = self.origin;\r
                self.prevorigin = self.origin;\r
                self.lastrocket = world; // stop rocket guiding, no revenge from the grave!\r
                self.oldorigin = self.origin;\r
                self.prevorigin = self.origin;\r
                self.lastrocket = world; // stop rocket guiding, no revenge from the grave!\r

+               self.lastteleporttime = time; // prevent insane speeds due to changing origin\r

 \r
                if(g_arena)\r
                {\r
 \r
                if(g_arena)\r
                {\r