From: Lyberta <lyberta@lyberta.net>
Date: Sun, 30 Jul 2017 07:57:45 +0000 (+0300)
Subject: Merged master
X-Git-Tag: xonotic-v0.8.5~2482^2~17
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=050fb0011ae5fb2b36c7c7f3d560f9453807a8ab

Merged master
---

050fb0011ae5fb2b36c7c7f3d560f9453807a8ab
diff --cc qcsrc/server/client.qc
index 3f9273b3ca,804868fa00..513a796780
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -885,13 -888,11 +890,13 @@@ void ClientKill_Now(entity this
  
  	this.killindicator = NULL;
  
- 	if(this.killindicator_teamchange)
+ 	if(CS(this).killindicator_teamchange)
  		ClientKill_Now_TeamChange(this);
  
 -	if(!IS_SPEC(this) && !IS_OBSERVER(this))
 +	if (!IS_SPEC(this) && !IS_OBSERVER(this) && MUTATOR_CALLHOOK(ClientKill_Now, this) == false)
 +	{
  		Damage(this, this, this, 100000, DEATH_KILL.m_id, this.origin, '0 0 0');
 +	}
  
  	// now I am sure the player IS dead
  }