Merge branch 'master' into mirceakitsune/universal_reload_system

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_quake3.qc

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index b96599475871932968acaaeba50101afdf395d48..8cc7e479791b6a3fc8bec91c48383355953f2563 100644 (file)
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -135,13 +135,19 @@ void spawnfunc_item_flight()         { spawnfunc_item_jetpack();       }
 .float notsingle;
 .float notfree;
 .float notq3a;
+.float notta;
 .string gametype;
 float DoesQ3ARemoveThisEntity()
 {
        // Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
 
        if(self.notq3a)
-               return 1;
+               if(!teams_matter || g_tdm || g_ctf)
+                       return 1;
+
+       if(self.notta)
+               if not(!teams_matter || g_tdm || g_ctf)
+                       return 1;
 
        if(self.notsingle)
                if(maxclients == 1)