Merge remote-tracking branch 'origin/terencehill/g_changeteam_banned_fix'

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

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c21fc78719d81260e7b01d99391f7ef1ea64b806..3d393755a0f3749d33793dc7b6de1e574c1284c2 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -158,7 +158,7 @@ vector Spawn_Score(entity spot, float mindist, float teamcheck)
                if (thisdist < shortest)
                        shortest = thisdist;
        }
-       if(shortest < mindist)
+       if(shortest > mindist)
                prio += SPAWN_PRIO_GOOD_DISTANCE;
 
        spawn_score = prio * '1 0 0' + shortest * '0 1 0';
@@ -1051,6 +1051,8 @@ void PutClientInServer (void)
 
                if(!self.alivetime)
                        self.alivetime = time;
+
+               antilag_clear(self);
        } else if(self.classname == "observer" || (g_ca && !allowed_to_spawn)) {
                PutObserverInServer ();
        }