Split CMapMigrations::OnEntitySpawned into pre/post

Author: Vauff

src/cs2fixes.cpp

@@ -1191,7 +1191,7 @@ void CS2Fixes::Hook_SetGameSpawnGroupMgr(IGameSpawnGroupMgr* pSpawnGroupMgr)
 void CS2Fixes::Hook_Spawn(int nCount, const EntitySpawnInfo_t* pInfo)
 {
 	for (int i = 0; i < nCount; i++)
-		g_pMapMigrations->OnEntitySpawned(pInfo[i].m_pEntity->m_pInstance, pInfo[i].m_pKeyValues);
+		g_pMapMigrations->OnEntitySpawned_Pre(reinterpret_cast<CBaseEntity*>(pInfo[i].m_pEntity->m_pInstance), pInfo[i].m_pKeyValues);
 }
 
 float g_fTeleportXAngle;

src/entitylistener.cpp

@@ -26,6 +26,7 @@
 #include "entityclass.h"
 #include "entwatch.h"
 #include "gameconfig.h"
+#include "mapmigrations.h"
 #include "plat.h"
 
 CEntityListener* g_pEntityListener = nullptr;
@@ -43,6 +44,7 @@ void CEntityListener::OnEntitySpawned(CEntityInstance* pEntity)
 		reinterpret_cast<CBaseEntity*>(pEntity)->SetCollisionGroup(COLLISION_GROUP_DEBRIS);
 
 	EntityHandler_OnEntitySpawned(reinterpret_cast<CBaseEntity*>(pEntity));
+	g_pMapMigrations->OnEntitySpawned_Post(reinterpret_cast<CBaseEntity*>(pEntity));
 
 	if (g_cvarEnableEntWatch.Get())
 		EW_OnEntitySpawned(pEntity);

src/mapmigrations.cpp

@@ -50,16 +50,17 @@ void CMapMigrations::OnRoundPrestart()
 	m_vecEquippedWeapons.clear();
 }
 
-void CMapMigrations::OnEntitySpawned(CEntityInstance* pEntity, const CEntityKeyValues* pKeyValues)
+void CMapMigrations::OnEntitySpawned_Pre(CBaseEntity* pEntity, const CEntityKeyValues* pKeyValues)
 {
-	CBaseEntity* pBaseEntity = (CBaseEntity*)pEntity;
-
 	// Stupid workaround for CEntityKeyValues being inaccessible after entity spawn
 	// We need access to this in 2026-01-21 rendermode migrations when called from UpdateMapUpdateTime
-	if (pBaseEntity->AsBaseModelEntity() && V_StringToInt32(pKeyValues->GetString("rendermode"), -1, NULL, NULL, PARSING_FLAG_SKIP_WARNING) == -1)
-		m_vecModelEntitiesUsingRendermodeEnum.push_back(pBaseEntity->GetHandle());
+	if (pEntity->AsBaseModelEntity() && V_StringToInt32(pKeyValues->GetString("rendermode"), -1, NULL, NULL, PARSING_FLAG_SKIP_WARNING) == -1)
+		m_vecModelEntitiesUsingRendermodeEnum.push_back(pEntity->GetHandle());
+}
 
-	RunMigrations(pBaseEntity);
+void CMapMigrations::OnEntitySpawned_Post(CBaseEntity* pEntity)
+{
+	RunMigrations(pEntity);
 }
 
 void CMapMigrations::OnEquipWeapon(CBasePlayerWeapon* pWeapon)

src/mapmigrations.h

@@ -54,7 +54,8 @@ class CMapMigrations
 public:
 	void ApplyGameSettings(KeyValues* pKV);
 	void OnRoundPrestart();
-	void OnEntitySpawned(CEntityInstance* pEntity, const CEntityKeyValues* pKeyValues);
+	void OnEntitySpawned_Pre(CBaseEntity* pEntity, const CEntityKeyValues* pKeyValues);
+	void OnEntitySpawned_Post(CBaseEntity* pEntity);
 	void OnEquipWeapon(CBasePlayerWeapon* pWeapon);
 	void RunMigrations(CBaseEntity* pEntity);
 	void Migrations_20260121(CBaseEntity* pEntity);