update player glow colour and glow status when they change team

mp/src/game/client/c_basecombatcharacter.cpp

@@ -163,12 +163,10 @@ void C_BaseCombatCharacter::UpdateGlowEffect( void )
 	if ( m_bGlowEnabled || m_bClientSideGlowEnabled )
 	{
 		float r, g, b;
+		GetGlowEffectColor( &r, &g, &b );
 #ifdef NEO
-		NEORules()->GetTeamGlowColor(GetTeamNumber(), r, g, b);
-		SetGlowEffectColor(r, g, b);
 		m_pGlowEffect = new CGlowObject( this, Vector( r, g, b ), 1.0, true, true );
 #else
-		GetGlowEffectColor( &r, &g, &b );
 		m_pGlowEffect = new CGlowObject( this, Vector( r, g, b ), 1.0, true );
 #endif
 	}

mp/src/game/client/clientmode_shared.cpp

@@ -69,6 +69,7 @@ extern ConVar replay_rendersetting_renderglow;
 #include "c_neo_player.h"
 #include <GameUI/IGameUI.h>
 #include "ui/neo_loading.h"
+#include "neo_gamerules.h"
 #endif
 
 #ifdef GLOWS_ENABLE
@@ -1126,6 +1127,18 @@ void ClientModeShared::FireGameEvent( IGameEvent *event )
 	else if ( Q_strcmp( "player_team", eventname ) == 0 )
 	{
 		C_BasePlayer *pPlayer = USERID2PLAYER( event->GetInt("userid") );
+#ifdef NEO
+#ifdef GLOWS_ENABLE
+		if (pPlayer && glow_outline_effect_enable.GetBool())
+		{ // NEO JANK (Adam) bots join their final team before they are created client side, so pPlayer here will be null for them, and setting clientsideglow on them in c_neo_player::Spawn() results in an incorrect glow colour. This works for players though
+			float r, g, b;
+			NEORules()->GetTeamGlowColor(event->GetInt("team"), r, g, b);
+			pPlayer->SetGlowEffectColor(r, g, b);
+			pPlayer->SetClientSideGlowEnabled(true);
+		}
+#endif // GLOWS_ENABLE
+#endif // NEO
+
 		if ( !hudChat )
 			return;
 

mp/src/game/client/glow_outline_effect.cpp

@@ -12,6 +12,11 @@
 #include "materialsystem/itexture.h"
 #include "view_shared.h"
 #include "viewpostprocess.h"
+#ifdef GLOWS_ENABLE
+#ifdef NEO
+#include "neo_gamerules.h"
+#endif // NEO
+#endif // GLOWS_ENABLE
 
 #define FULL_FRAME_TEXTURE "_rt_FullFrameFB"
 
@@ -24,6 +29,9 @@ static void glowOutlineEffectToggleCallBack(IConVar* var, const char* pOldValue,
 	{
 		if (auto player = UTIL_PlayerByIndex(i))
 		{
+			float r, g, b;
+			NEORules()->GetTeamGlowColor(player->GetTeamNumber(), r, g, b);
+			player->SetGlowEffectColor(r, g, b);
 			player->SetClientSideGlowEnabled(!flOldValue);
 		}
 	}