Merge remote branch 'origin/divVerent/nixnex-fixes'

diff --combined qcsrc/server/cl_client.qc
index 6ea97a656cdbde2a372b01738af37032b39815ee,57e520bfcaa584f509de35517b667a55f46db9bd..f3d34bb47531dcef705aa032d86a40fb8fae9db2
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1086,7 -1086,6 +1086,6 @@@ void PutClientInServer (void
                        if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
                                self.weapon_load[j] = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));
                }
-               self.weapon_forbidchange = FALSE;
  
                oldself = self;
                self = spot;
@@@ -2313,8 -2312,7 +2312,8 @@@ void SpectateCopy(entity spectatee) 
        self.dmg_save = spectatee.dmg_save;
        self.dmg_inflictor = spectatee.dmg_inflictor;
        self.angles = spectatee.v_angle;
 -      self.fixangle = TRUE;
 +      if(!self.BUTTON_USE)
 +              self.fixangle = TRUE;
        setorigin(self, spectatee.origin);
        setsize(self, spectatee.mins, spectatee.maxs);
        SetZoomState(spectatee.zoomstate);