From 37a13e3175cd7d51175bc706b94df5db82afa4e3 Mon Sep 17 00:00:00 2001 From: Alan Shen Date: Fri, 3 Jul 2026 19:29:09 -0600 Subject: [PATCH 1/2] Don't copy takeover bot's class loadout choice --- src/game/server/neo/neo_player.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/game/server/neo/neo_player.cpp b/src/game/server/neo/neo_player.cpp index 5a3536e13..01ca947cf 100644 --- a/src/game/server/neo/neo_player.cpp +++ b/src/game/server/neo/neo_player.cpp @@ -4177,7 +4177,6 @@ void CNEO_Player::SpectatorTakeoverPlayerPreThink() SetArmorValue(pPlayerTakeoverTarget->ArmorValue()); m_HL2Local.m_cloakPower = pPlayerTakeoverTarget->m_HL2Local.m_cloakPower; m_HL2Local.m_flSuitPower = pPlayerTakeoverTarget->m_HL2Local.m_flSuitPower; - m_iLoadoutWepChoice = pPlayerTakeoverTarget->m_iLoadoutWepChoice; m_bInThermOpticCamo = pPlayerTakeoverTarget->m_bInThermOpticCamo; m_bHasBeenAirborneForTooLongToSuperJump = pPlayerTakeoverTarget->m_bHasBeenAirborneForTooLongToSuperJump; @@ -4185,8 +4184,6 @@ void CNEO_Player::SpectatorTakeoverPlayerPreThink() Weapon_SetZoom(pPlayerTakeoverTarget->m_bInAim); m_bCarryingGhost = pPlayerTakeoverTarget->m_bCarryingGhost; m_bInLean = pPlayerTakeoverTarget->m_bInLean; - m_iLoadoutWepChoice = pPlayerTakeoverTarget->m_iLoadoutWepChoice; - m_iNextSpawnClassChoice = pPlayerTakeoverTarget->m_iNextSpawnClassChoice; m_flCamoAuxLastTime = pPlayerTakeoverTarget->m_flCamoAuxLastTime; m_flLastAirborneJumpOkTime = pPlayerTakeoverTarget->m_flLastAirborneJumpOkTime; m_flLastSuperJumpTime = pPlayerTakeoverTarget->m_flLastSuperJumpTime; From 6bec331ab27c2de20deedf0f286afcd8e5d411bc Mon Sep 17 00:00:00 2001 From: Alan Shen Date: Fri, 3 Jul 2026 22:37:03 -0600 Subject: [PATCH 2/2] Also don't override client side class loadout selection --- src/game/client/neo/c_neo_player.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/game/client/neo/c_neo_player.cpp b/src/game/client/neo/c_neo_player.cpp index 2ab66527f..f7d082a9f 100644 --- a/src/game/client/neo/c_neo_player.cpp +++ b/src/game/client/neo/c_neo_player.cpp @@ -2051,8 +2051,6 @@ void C_NEO_Player::CSpectatorTakeoverPlayerUpdate(C_NEO_Player* pPlayerTakeoverT m_nSkin = pPlayerTakeoverTarget->m_iNeoSkin; m_iNeoClass = pPlayerTakeoverTarget->m_iNeoClass; - m_iLoadoutWepChoice = pPlayerTakeoverTarget->m_iLoadoutWepChoice; - m_iNextSpawnClassChoice = pPlayerTakeoverTarget->m_iNextSpawnClassChoice; m_bInThermOpticCamo = pPlayerTakeoverTarget->m_bInThermOpticCamo; m_bInVision = pPlayerTakeoverTarget->m_bInVision;