From: terencehill <piuntn@gmail.com>
Date: Sun, 7 Mar 2021 23:23:48 +0000 (+0100)
Subject: Restore an updated version of the blacklist of entities that WarpZone_FindRadius... 
X-Git-Tag: xonotic-v0.8.5~521
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8db12004f0bd609e075c678b3734dfea142c1e41;p=xonotic%2Fxonotic-data.pk3dir.git

Restore an updated version of the blacklist of entities that WarpZone_FindRadius doesn't care about
---

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index af0e7ef94..38e0e37d9 100644
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -571,13 +571,27 @@ vector WarpZoneLib_NearestPointOnBox(vector mi, vector ma, vector org)
 	return nearest;
 }
 
+// blacklist of entities that WarpZone_FindRadius doesn't care about
 bool WarpZoneLib_BadEntity(entity e)
 {
 	if (is_pure(e)) return true;
 	string s = e.classname;
 
-	//if (s == "net_linked") return true; // actually some real entities are linked without classname, fail
-	if (s == "") return true;
+	switch(s)
+	{
+		case "weaponentity":
+		case "exteriorweaponentity":
+		case "sprite_waypoint":
+		case "waypoint":
+		case "gibsplash":
+		case "damageinfo":
+		case "spawnfunc":
+		case "weaponchild":
+		case "chatbubbleentity":
+		//case "net_linked": // actually some real entities are linked without classname, fail
+		case "":
+			return true;
+	}
 
 	if (startsWith(s, "target_")) return true;