From efc7309878d2458a3ad2f3685765bcbd89267aeb Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Tue, 22 Dec 2009 10:21:28 +0000
Subject: [PATCH] more minsta fixes

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8446 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/g_damage.qc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index 0e4606697..707827845 100644
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -739,12 +739,13 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				(deathtype == DEATH_DROWN) ||
 				(deathtype == DEATH_SLIME) ||
 				(deathtype == DEATH_LAVA)  ||
-				(damage < 100))
+				(!DEATH_ISWEAPON(deathtype, WEP_LASER) && damage > 0 && damage < 100))
 			{
 				self = oldself;
 				return;
 			}
-			damage = 10000;
+			if(damage > 0)
+			    damage = 10000;
 			if (targ.armorvalue && (deathtype == WEP_MINSTANEX) && damage)
 			{
 				targ.armorvalue -= 1;
-- 
2.39.2