From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 29 Mar 2016 19:29:25 +0000 (-0400)
Subject: Stop conveyors from moving a player after respawning elsewhere.
X-Git-Tag: xonotic-v0.8.2~987
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fc3b6ae7497ba0acdac3b91bf341f21df7135d80;p=xonotic%2Fxonotic-data.pk3dir.git

Stop conveyors from moving a player after respawning elsewhere.
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 9edcf8d5f..45d8b5358 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -569,7 +569,8 @@ void PutClientInServer()
 		this.oldorigin = this.origin;
 		this.prevorigin = this.origin;
 		this.lastteleporttime = time; // prevent insane speeds due to changing origin
-        this.hud = HUD_NORMAL;
+		this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player
+		this.hud = HUD_NORMAL;
 
 		this.event_damage = PlayerDamage;