From 98c234da483b79a9e7e4d606f78508209edc303e Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 27 Oct 2021 03:06:29 +0200
Subject: [PATCH] SurfaceData: Non NSSurfacePropEntity class ents will just use
 the generic world check for impact effect lookup.

---
 src/shared/surfaceproperties.qc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/surfaceproperties.qc b/src/shared/surfaceproperties.qc
index 32066f12..fd2a598c 100644
--- a/src/shared/surfaceproperties.qc
+++ b/src/shared/surfaceproperties.qc
@@ -415,7 +415,7 @@ SurfData_Finish(void)
 void
 SurfData_Impact(entity e, int fl, vector org, vector ang)
 {
-	if (e == world) { /* the static world */
+	if (e == world || e.health == 0) { /* the static world */
 		switch (serverkeyfloat("*bspversion")) {
 		case BSPVER_HL:
 			float surf;
@@ -432,7 +432,7 @@ SurfData_Impact(entity e, int fl, vector org, vector ang)
 		default:
 			FX_Impact(IMPACT_DEFAULT, org, ang);
 		}
-	} else { /* props, entities */
+	} else { /* props */
 		NSSurfacePropEntity foo = (NSSurfacePropEntity)e;
 		FX_Impact(foo.GetSurfaceData(SURFDATA_FX_IMPACT), org, ang);
 	}