]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove player from conveyor list when respawning
authorMario <mario@smbclan.net>
Mon, 22 Aug 2016 09:59:24 +0000 (19:59 +1000)
committerMario <mario@smbclan.net>
Mon, 22 Aug 2016 09:59:24 +0000 (19:59 +1000)
qcsrc/server/client.qc

index 9a38c2f6117fd78b2bed744648c53305c218cbf1..f06f9ae652922f1b0a2b0a63fe23b0e7f2c994b0 100644 (file)
@@ -629,6 +629,8 @@ void PutClientInServer(entity this)
                this.oldorigin = this.origin;
                this.prevorigin = this.origin;
                this.lastteleporttime = time; // prevent insane speeds due to changing origin
+               if(this.conveyor)
+                       IL_REMOVE(g_conveyed, this);
                this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player
                this.hud = HUD_NORMAL;