summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/g_client.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c
index ea4aab82..911d9792 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1388,6 +1388,10 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
else if( client->pers.classSelection == PCL_NONE )
client->sess.spectatorState = SPECTATOR_LOCKED;
+ // if client is dead and following teammate, stop following before spawning
+ if( ent->client->sess.spectatorState == SPECTATOR_FOLLOW )
+ G_StopFollowing( ent );
+
if( origin != NULL )
VectorCopy( origin, spawn_origin );