Fix joining after spectating keeping the spectatee's gun alignment

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qc

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index ffd380810fec393f7607ea8615ee83a3fd6e268e..3ecac48855e7b0c8a274809c79298758b981dc35 100644 (file)
--- 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;