From: Lyberta <lyberta@lyberta.net>
Date: Mon, 28 Aug 2017 22:27:11 +0000 (+0300)
Subject: URS: Ported Campcheck mutator to URS.
X-Git-Tag: xonotic-v0.8.5~2488^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2a55a4dab26b6b1ff517ab1c1e75f3bd0ea2293a;p=xonotic%2Fxonotic-data.pk3dir.git

URS: Ported Campcheck mutator to URS.
---

diff --git a/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc b/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc
index 52fc52466..a64f9d080 100644
--- a/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc
+++ b/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc
@@ -64,7 +64,7 @@ MUTATOR_HOOKFUNCTION(campcheck, PlayerPreThink)
 				if(player.vehicle)
 					Damage(player.vehicle, NULL, NULL, autocvar_g_campcheck_damage * 2, DEATH_CAMP.m_id, player.vehicle.origin, '0 0 0');
 				else
-					Damage(player, NULL, NULL, bound(0, autocvar_g_campcheck_damage, player.health + player.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, player.origin, '0 0 0');
+					Damage(player, NULL, NULL, bound(0, autocvar_g_campcheck_damage, GetResourceAmount(player, RESOURCE_HEALTH) + GetResourceAmount(player, RESOURCE_ARMOR) * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, player.origin, '0 0 0');
 			}
 			player.campcheck_nextcheck = time + autocvar_g_campcheck_interval;
 			player.campcheck_traveled_distance = 0;