From fdc70a4e37629379c7942c71b2ebb3c741e2e04b Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 4 Sep 2008 13:38:44 +0000 Subject: [PATCH] possibly fix telefragging git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4340 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/t_teleporters.qc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/data/qcsrc/server/t_teleporters.qc b/data/qcsrc/server/t_teleporters.qc index f0178c910..ea0c0280a 100644 --- a/data/qcsrc/server/t_teleporters.qc +++ b/data/qcsrc/server/t_teleporters.qc @@ -35,12 +35,15 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle float deathradius; deathmin = player.absmin; deathmax = player.absmax; - if(deathmin_x > telefragmin_x) deathmin_x = telefragmin_x; - if(deathmin_y > telefragmin_y) deathmin_y = telefragmin_y; - if(deathmin_z > telefragmin_z) deathmin_z = telefragmin_z; - if(deathmax_x < telefragmax_x) deathmax_x = telefragmax_x; - if(deathmax_y < telefragmax_y) deathmax_y = telefragmax_y; - if(deathmax_z < telefragmax_z) deathmax_z = telefragmax_z; + if(telefragmin != telefragmax) + { + if(deathmin_x > telefragmin_x) deathmin_x = telefragmin_x; + if(deathmin_y > telefragmin_y) deathmin_y = telefragmin_y; + if(deathmin_z > telefragmin_z) deathmin_z = telefragmin_z; + if(deathmax_x < telefragmax_x) deathmax_x = telefragmax_x; + if(deathmax_y < telefragmax_y) deathmax_y = telefragmax_y; + if(deathmax_z < telefragmax_z) deathmax_z = telefragmax_z; + } deathradius = max(vlen(deathmin), vlen(deathmax)); for(head = findradius(player.origin, deathradius); head; head = head.chain) if(head != player) -- 2.39.2