X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Fteleporters.qc;h=1b0c9a3da30445db53de7c185be7f7965370c394;hb=db280a66b7b7ac88eaf779e80d71373c8d09cc98;hp=da86cabce89b83c048ed8a99342e07d501dcee2b;hpb=ad2d918472c84295255fba550959b58cacc9cfb1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc
index da86cabce..1b0c9a3da 100644
--- a/qcsrc/common/mapobjects/teleporters.qc
+++ b/qcsrc/common/mapobjects/teleporters.qc
@@ -11,12 +11,12 @@
     #include "../util.qh"
     #include <server/weapons/csqcprojectile.qh>
     #include <server/autocvars.qh>
-    #include <server/constants.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
     #include "../deathtypes/all.qh"
     #include "../turrets/sv_turrets.qh"
     #include "../vehicles/all.qh"
-    #include "../mapinfo.qh"
+    #include <common/gamemodes/_mod.qh>
     #include <server/anticheat.qh>
 #endif
 
@@ -146,9 +146,12 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 #ifdef SVQC
 	if(IS_PLAYER(player))
 	{
-		if(tflags & TELEPORT_FLAG_TDEATH)
-			if(player.takedamage && !IS_DEAD(player) && !g_race && !g_cts && (autocvar_g_telefrags || (tflags & TELEPORT_FLAG_FORCE_TDEATH)))
-				tdeath(player, teleporter, telefragger, telefragmin, telefragmax);
+		if((tflags & TELEPORT_FLAG_TDEATH) && player.takedamage && !IS_DEAD(player)
+			&& !g_race && !g_cts && (autocvar_g_telefrags || (tflags & TELEPORT_FLAG_FORCE_TDEATH))
+			&& !(round_handler_IsActive() && !round_handler_IsRoundStarted()))
+		{
+			tdeath(player, teleporter, telefragger, telefragmin, telefragmax);
+		}
 
 		// player no longer is on ground
 		UNSET_ONGROUND(player);