X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=68a86e9c479e7f68a9908fc12230831f2bb50803;hb=bc79763325f92e7688f6e61d24b42d35eb08d989;hp=aebea7523f66fea9e67d93ee485024bffeb9ff36;hpb=2c5f7f2b33fb403cbd719696cd42e6544318d79b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index aebea7523..68a86e9c4 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -232,10 +232,11 @@ void StartFrame (void)
 .float anglejitter;
 .string gametypefilter;
 .string cvarfilter;
+float DoesQ3ARemoveThisEntity();
 void SV_OnEntityPreSpawnFunction()
 {
 	if(self.gametypefilter != "")
-	if not(isGametypeInFilter(game, teams_matter, self.gametypefilter))
+	if not(isGametypeInFilter(game, teams_matter, have_team_spawns, self.gametypefilter))
 	{
 		remove(self);
 		return;
@@ -350,6 +351,12 @@ void SV_OnEntityPreSpawnFunction()
 		}
 	}
 
+	if(DoesQ3ARemoveThisEntity())
+	{
+		remove(self);
+		return;
+	}
+
 	// support special -1 and -2 angle from radiant
 	if (self.angles == '0 -1 0')
 		self.angles = '-90 0 0';