From: Mario <mario@smbclan.net>
Date: Mon, 22 Aug 2016 09:59:24 +0000 (+1000)
Subject: Remove player from conveyor list when respawning
X-Git-Tag: xonotic-v0.8.2~663^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b09f3c62f6ec0cb6f320922ac495560ca9e7d5c3;p=xonotic%2Fxonotic-data.pk3dir.git

Remove player from conveyor list when respawning
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 9a38c2f61..f06f9ae65 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -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;