From: Mario <zacjardine@y7mail.com>
Date: Fri, 13 Mar 2015 19:17:27 +0000 (+1100)
Subject: Negate fall damage while carrying jump buff
X-Git-Tag: xonotic-v0.8.1~18^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d259bf508914bfb00918e7f34e35de0dde6c867a;p=xonotic%2Fxonotic-data.pk3dir.git

Negate fall damage while carrying jump buff
---

diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc
index 5d16d94d7..a704b7284 100644
--- a/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@ -418,6 +418,10 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerDamage_Calculate)
 	if(random() <= autocvar_g_buffs_medic_survive_chance)
 		frag_damage = max(5, frag_target.health - autocvar_g_buffs_medic_survive_health);
 
+	if(frag_target.buffs & BUFF_JUMP)
+	if(frag_deathtype == DEATH_FALL)
+		frag_damage = 0;
+
 	if(frag_target.buffs & BUFF_VENGEANCE)
 	if(frag_attacker)
 	if(frag_attacker != frag_target)