From: Mario <mario@smbclan.net>
Date: Thu, 16 Feb 2017 07:02:00 +0000 (+1000)
Subject: Fix joining after spectating keeping the spectatee's gun alignment
X-Git-Tag: xonotic-v0.8.2~204
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9da9802e3ccfef828f595a779ecfd22583520329;p=xonotic%2Fxonotic-data.pk3dir.git

Fix joining after spectating keeping the spectatee's gun alignment
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index ffd380810..3ecac4885 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -655,7 +655,7 @@ void PutClientInServer(entity this)
 			.entity weaponentity = weaponentities[slot];
 			entity oldwep = this.(weaponentity);
 			CL_SpawnWeaponentity(this, weaponentity);
-			if(oldwep)
+			if(oldwep && oldwep.owner == this)
 				this.(weaponentity).m_gunalign = oldwep.m_gunalign;
 		}
 		this.alpha = default_player_alpha;