Merged master
authorLyberta <lyberta@lyberta.net>
Sun, 30 Jul 2017 07:57:45 +0000 (10:57 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 30 Jul 2017 07:57:45 +0000 (10:57 +0300)
1  2 
qcsrc/server/autocvars.qh
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc
qcsrc/server/player.qh
qcsrc/server/teamplay.qc

Simple merge
@@@ -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
  }
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge