Skip to content

[TF2] Fix interaction between YER and disguise target switching teams #1867

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
dilbertron2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[TF2] Fix interaction between YER and disguise target switching teams #1867

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
482e0a4
Implement Changes
dilbertron2 Mar 31, 2026
3cc89db
comment elaboration
dilbertron2 Mar 31, 2026
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
7 changes: 7 additions & 0 deletions src/game/shared/tf/tf_player_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8162,6 +8162,13 @@ void CTFPlayerShared::Disguise( int nTeam, int nClass, CTFPlayer* pDesiredTarget
// not allowed to disguise while taunting
return;
}

// If disguising due to 'Your Eternal Reward' backstab, ensure that disguise team is the opposing team
// Fixes issue with backstabbing an enemy that then gets autobalanced, disguising the spy as his own team
if (nRealTeam == nTeam && bOnKill)
{
nTeam = (nRealTeam == TF_TEAM_RED) ? TF_TEAM_BLUE : TF_TEAM_RED;
}

// we're not disguising as anything but ourselves (so reset everything)
if ( nRealTeam == nTeam && nRealClass == nClass )
Expand Down