From: Mario <zacjardine@y7mail.com>
Date: Wed, 25 Mar 2015 03:34:59 +0000 (+1100)
Subject: Merge branch 'master' into Mario/combined_updates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21a31973908c422ad9317bc8b3b6e295697e6515;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/combined_updates
---

21a31973908c422ad9317bc8b3b6e295697e6515
diff --cc qcsrc/server/mutators/mutator_overkill.qc
index 136caf668,6818b4564..75e13fdea
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@@ -64,8 -64,9 +64,9 @@@ MUTATOR_HOOKFUNCTION(ok_PlayerDamage_Sp
  MUTATOR_HOOKFUNCTION(ok_PlayerDies)
  {
  	entity oldself = self;
+ 	entity targ = ((frag_attacker) ? frag_attacker : frag_target);
  
 -	if(self.flags & FL_MONSTER)
 +	if(IS_MONSTER(self))
  	{
  		remove(other); // remove default item
  		other = world;