Skip to content

[TF2] Fix being unable to change into an already desired class #1930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adrad1234 wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −13
Open

[TF2] Fix being unable to change into an already desired class #1930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/game/server/tf/tf_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6925,19 +6925,6 @@ void CTFPlayer::HandleCommand_JoinClass( const char *pClassName, bool bAllowSpaw
}
#endif // _DEBUG || STAGING_ONLY

// joining the same class?
if ( iClass != TF_CLASS_RANDOM && iClass == GetDesiredPlayerClassIndex() )
{
// If we're dead, and we have instant spawn, respawn us immediately. Catches the case
// where a player misses respawn wave because they're at the class menu, and then changes
// their mind and reselects their current class.
if ( m_bAllowInstantSpawn && !IsAlive() )
{
ForceRespawn();
}
return;
}

if ( TFGameRules()->IsInArenaMode() && tf_arena_use_queue.GetBool() == true && GetTeamNumber() <= LAST_SHARED_TEAM )
{
TFGameRules()->AddPlayerToQueue( this );
Expand Down