Merge branch 'z411/ready_improvements' into 'master'

Improvements for Ready system in warmup

See merge request xonotic/xonotic-data.pk3dir!966

diff --cc qcsrc/server/client.qc
index 3af147c21374c52f3cec6aa3cc2e3c1d09b432f0,260967eb31c4cff85bc9a4b89a4770619ffcd8bf..8950854305c472ed3463d974bf28a8890da70cb6
--- 1/qcsrc/server/client.qc
--- 2/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -235,9 -235,10 +235,10 @@@ void setplayermodel(entity e, string mo
  }
  
  /** putting a client as observer in the server */
 -void PutObserverInServer(entity this, bool is_forced)
 +void PutObserverInServer(entity this, bool is_forced, bool use_spawnpoint)
  {
        bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this, is_forced);
+       bool recount_ready = false;
        PlayerState_detach(this);
  
        if (IS_PLAYER(this))

diff --cc qcsrc/server/command/cmd.qc
Simple merge