summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/g_cmds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 9a835acd..efcf4938 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -2662,6 +2662,10 @@ qboolean G_FollowNewClient( gentity_t *ent, int dir )
if( clientnum < 0 )
clientnum = level.maxclients - 1;
+ // can't follow self
+ if( level.clients[ clientnum ].pers.connected != CON_CONNECTED )
+ continue;
+
// avoid selecting existing follow target
if( clientnum == original && !selectAny )
continue; //effectively break;
@@ -2685,10 +2689,6 @@ qboolean G_FollowNewClient( gentity_t *ent, int dir )
ent->client->pers.teamSelection ) )
continue;
- // can't follow dead client
- if( level.clients[ clientnum ].ps.stats[ STAT_HEALTH ] <= 0 )
- continue;
-
// this is good, we can use it
ent->client->sess.spectatorClient = clientnum;
ent->client->sess.spectatorState = SPECTATOR_FOLLOW;