From: Mario Date: Sat, 30 Apr 2016 08:07:25 +0000 (+1000) Subject: Fix campcheck counting as self damage X-Git-Tag: xonotic-v0.8.2~942 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95b2eef5d91f22951b05fb95fcd0e6fbac5c2725;p=xonotic%2Fxonotic-data.pk3dir.git Fix campcheck counting as self damage --- diff --git a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc index 1d0bd19eb..0036bbaf3 100644 --- a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc +++ b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc @@ -58,9 +58,9 @@ MUTATOR_HOOKFUNCTION(campcheck, PlayerPreThink) { Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_CAMPCHECK); if(self.vehicle) - Damage(self.vehicle, self, self, autocvar_g_campcheck_damage * 2, DEATH_CAMP.m_id, self.vehicle.origin, '0 0 0'); + Damage(self.vehicle, world, world, autocvar_g_campcheck_damage * 2, DEATH_CAMP.m_id, self.vehicle.origin, '0 0 0'); else - Damage(self, self, self, bound(0, autocvar_g_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, self.origin, '0 0 0'); + Damage(self, world, world, bound(0, autocvar_g_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, self.origin, '0 0 0'); } self.campcheck_nextcheck = time + autocvar_g_campcheck_interval; self.campcheck_traveled_distance = 0;