From: terencehill <piuntn@gmail.com>
Date: Thu, 3 Mar 2022 07:57:32 +0000 (+0000)
Subject: Merge branch 'z411/ready_improvements' into 'master'
X-Git-Tag: xonotic-v0.8.5~181
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=f384efe9ffa660805f56e90573e9173adacd248e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'z411/ready_improvements' into 'master'

Improvements for Ready system in warmup

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

f384efe9ffa660805f56e90573e9173adacd248e
diff --cc qcsrc/server/client.qc
index 3af147c21,260967eb3..895085430
--- a/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))