From 68c56ef8b29e3c08db19845a0af5c1ddf877ed76 Mon Sep 17 00:00:00 2001 From: Ymihere03 Date: Wed, 29 May 2024 23:06:01 -0600 Subject: [PATCH] Auto-spectate now uses limbo timer to not switch spectate player too quickly --- src/game/CAbstractPlayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/CAbstractPlayer.cpp b/src/game/CAbstractPlayer.cpp index a12b0ff8..d3db6b3b 100644 --- a/src/game/CAbstractPlayer.cpp +++ b/src/game/CAbstractPlayer.cpp @@ -1629,9 +1629,9 @@ void CAbstractPlayer::PlayerAction() { // Auto spectate another player if: // - The player runs out of lives - // - The player being spectated runs out of lives + // - The player being spectated runs out of lives (check that players limbo timer to prevent fast transition) if ((itsGame->GetSpectatePlayer() == NULL && itsManager->IsLocalPlayer()) || - (itsGame->GetSpectatePlayer() != NULL && itsGame->GetSpectatePlayer()->lives == 0)) { + (itsGame->GetSpectatePlayer() != NULL && itsGame->GetSpectatePlayer()->lives == 0 && itsGame->GetSpectatePlayer()->limboCount <= 0)) { itsGame->SpectateNext(); } }