From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 23 Jul 2010 05:58:24 +0000 (+0200)
Subject: stop damaging the world
X-Git-Tag: xonotic-v0.1.0preview~423^2~17
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=148182923b5ab92b36cffc8e70fdfb6cda434ecb;hp=b4777dff6e4b4dbb59e3ec07037926116a0c1cd3;p=xonotic%2Fxonotic-data.pk3dir.git

stop damaging the world
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index fed520492..0296c797a 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -252,7 +252,7 @@ void lgbeam_think()
 		self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime);
 
 	// apply the damage
-	if(trace_fraction < 1)
+	if(trace_ent)
 	{
 		vector force;
 		force = angle * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up");
diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index c3840ac9e..efb1cfab5 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -180,7 +180,7 @@ void gauntletbeam_think()
 	self.owner.dphitcontentsmask = oldsolid;
 
 	// apply the damage
-	if(trace_fraction < 1)
+	if(trace_ent)
 	{
 		vector force;
 		force = angle * myforce;