From: drjaska <drjaska83@gmail.com>
Date: Fri, 12 Mar 2021 04:58:56 +0000 (+0200)
Subject: Removed fall damage, initially added by an oversight.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a025c7f5216b414f79095ce6ef9ee0ee131a2bef;p=xonotic%2Fxonotic-data.pk3dir.git

Removed fall damage, initially added by an oversight.
---

diff --git a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
index b868b14ac..93b6d6346 100644
--- a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
+++ b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
@@ -64,9 +64,10 @@ MUTATOR_HOOKFUNCTION(mayhem, Damage_Calculate)
 {
 	entity frag_attacker = M_ARGV(1, entity);
 	entity frag_target = M_ARGV(2, entity);
+	float frag_deathtype = M_ARGV(3, float);
 	float frag_damage = M_ARGV(4, float);
 
-	if (frag_target == frag_attacker)
+	if (frag_target == frag_attacker || frag_deathtype == DEATH_FALL.m_id)
 		frag_damage = 0;
 
 	M_ARGV(4, float) = frag_damage;