fix attempt 2

Vaqtincha · Jun 12, 2021 · fd6b53a · fd6b53a
1 parent b9fe0a1
commit fd6b53a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
@@ -10124,20 +10124,17 @@ void CBasePlayer::PlayerRespawnThink()
 {
 #ifdef REGAMEDLL_ADD
 	if (GetObserverMode() != OBS_NONE && (m_iTeam == UNASSIGNED || m_iTeam == SPECTATOR))
+		return;
+
+	// Player cannot respawn while in the Choose Appearance menu
+	if (m_iMenu == Menu_ChooseAppearance || m_iJoiningState == SHOWTEAMSELECT)
 	{
 		if (CSPlayer()->m_flRespawnPending > 0)
-		{
 			CSPlayer()->m_flRespawnPending = 0.0f;
-			CSPlayer()->m_bGameForcingRespawn = false;
-		}
 
 		return;
 	}
 
-	// Player cannot respawn while in the Choose Appearance menu
-	if (m_iMenu == Menu_ChooseAppearance || m_iJoiningState == SHOWTEAMSELECT)
-		return;
-
 	if (pev->deadflag < DEAD_DYING)
 		return;