Merge branch 'master' into Mario/csqc_muzzleflash

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

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index e8b7fb89771e4879357160db85711686aa6c1776..3dc76afc0df832d926703f7ffd1fa2611af803ce 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -2,12 +2,13 @@
 
 #include <server/mutators/_mod.qh>
 #include "g_world.qh"
+#include "miscfunctions.qh"
 #include "race.qh"
 #include "defs.qh"
 #include "../common/constants.qh"
 #include <common/net_linked.qh>
 #include "../common/teams.qh"
-#include <common/mapinfo.qh>
+#include <common/gamemodes/_mod.qh>
 #include "../common/mapobjects/subs.qh"
 #include "../common/mapobjects/target/spawnpoint.qh"
 #include "../common/util.qh"
@@ -231,7 +232,7 @@ vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck, boo
 
        float prio = 0;
        float shortest = vlen(world.maxs - world.mins);
-       FOREACH_CLIENT(IS_PLAYER(it) && it != this, {
+       FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it) && it != this, {
                float thisdist = vlen(it.origin - spot.origin);
                if (thisdist < shortest)
                        shortest = thisdist;