Add a map migration for parented weapon entity heights

Author: Vauff

src/detours.cpp

@@ -407,6 +407,8 @@ void FASTCALL Detour_CCSPlayer_WeaponServices_EquipWeapon(CCSPlayer_WeaponServic
 	if (g_cvarEnableEntWatch.Get())
 		EW_Detour_CCSPlayer_WeaponServices_EquipWeapon(pWeaponServices, pPlayerWeapon);
 
+	g_pMapMigrations->OnEquipWeapon(pPlayerWeapon);
+
 	return CCSPlayer_WeaponServices_EquipWeapon(pWeaponServices, pPlayerWeapon);
 }
 

src/mapmigrations.cpp

@@ -22,6 +22,7 @@
 #include "entity.h"
 #include "entity/cbasemodelentity.h"
 #include "utils.h"
+#include "vprof.h"
 
 CMapMigrations* g_pMapMigrations = nullptr;
 
@@ -45,6 +46,7 @@ void CMapMigrations::ApplyGameSettings(KeyValues* pKV)
 void CMapMigrations::OnRoundPrestart()
 {
 	m_vecModelEntitiesUsingRendermodeEnum.clear();
+	m_vecEquippedWeapons.clear();
 }
 
 void CMapMigrations::OnEntitySpawned(CEntityInstance* pEntity, const CEntityKeyValues* pKeyValues)
@@ -59,6 +61,12 @@ void CMapMigrations::OnEntitySpawned(CEntityInstance* pEntity, const CEntityKeyV
 	RunMigrations(pBaseEntity);
 }
 
+void CMapMigrations::OnEquipWeapon(CBasePlayerWeapon* pWeapon)
+{
+	if (Migrations20260420Enabled())
+		Migrations_20260420(pWeapon);
+}
+
 void CMapMigrations::RunMigrations(CBaseEntity* pEntity)
 {
 	if (g_cvarMapMigrations20260121.Get() == 1 || (g_cvarMapMigrations20260121.Get() == 2 && m_timeMapUpdated < g_time20260121))
@@ -99,22 +107,54 @@ void CMapMigrations::Migrations_20260121(CBaseEntity* pEntity)
 	}
 }
 
-void CMapMigrations::UpdateMapUpdateTime(time_t timeMapUpdated)
+void CMapMigrations::Migrations_20260420(CBasePlayerWeapon* pWeapon)
 {
-	m_timeMapUpdated = timeMapUpdated;
+	VPROF("CMapMigrations::Migrations_20260420");
+
+	// We only care about map-spawned weapons
+	if (!V_strcmp(pWeapon->m_sUniqueHammerID().Get(), ""))
+		return;
+
+	// And only their first equip
+	for (int i = 0; i < m_vecEquippedWeapons.size(); i++)
+		if (m_vecEquippedWeapons[i] == pWeapon->GetHandle())
+			return;
 
+	m_vecEquippedWeapons.push_back(pWeapon->GetHandle());
 	CBaseEntity* pTarget = nullptr;
 
-	// May be called late, so also check any existing entities first
+	// Entities parented to weapons being held by players were offset by +40 units following the AG2 update
+	// Since that doesn't affect in-world weapons, this migration is delayed until weapon equip to prevent breaking strip triggers etc
+	// Alternatively, we may want to track weapon children ahead of time via OnEntityParentChanged if this ends up becoming a performance concern
 	while ((pTarget = UTIL_FindEntityByClassname(pTarget, "*")))
-		RunMigrations(pTarget);
+	{
+		CGameSceneNode* pParentSceneNode = pTarget->m_CBodyComponent()->m_pSceneNode()->m_pParent();
+
+		if (pParentSceneNode && pParentSceneNode->m_pOwner() == pWeapon)
+		{
+			Vector newOrigin = pTarget->GetAbsOrigin();
+			newOrigin.z -= 40.0f;
+			pTarget->Teleport(&newOrigin, nullptr, nullptr);
+		}
+	}
 }
 
 bool CMapMigrations::Migrations20260420Enabled()
 {
 	return g_cvarMapMigrations20260420.Get() == 1 || (g_cvarMapMigrations20260420.Get() == 2 && m_timeMapUpdated < g_time20260420);
 }
 
+void CMapMigrations::UpdateMapUpdateTime(time_t timeMapUpdated)
+{
+	m_timeMapUpdated = timeMapUpdated;
+
+	CBaseEntity* pTarget = nullptr;
+
+	// May be called late, so also check any existing entities first
+	while ((pTarget = UTIL_FindEntityByClassname(pTarget, "*")))
+		RunMigrations(pTarget);
+}
+
 std::shared_ptr<CMapMigrationWorkshopDetailsQuery> CMapMigrationWorkshopDetailsQuery::Create(uint64 iWorkshopId)
 {
 	if (!GetSteamUGC())

src/mapmigrations.h

@@ -21,6 +21,7 @@
 
 #include "KeyValues.h"
 #include "convar.h"
+#include "cs2_sdk/entity/ccsweaponbase.h"
 #include "ehandle.h"
 #include "entitysystem.h"
 #include "steam/isteamugc.h"
@@ -54,17 +55,20 @@ class CMapMigrations
 	void ApplyGameSettings(KeyValues* pKV);
 	void OnRoundPrestart();
 	void OnEntitySpawned(CEntityInstance* pEntity, const CEntityKeyValues* pKeyValues);
+	void OnEquipWeapon(CBasePlayerWeapon* pWeapon);
 	void RunMigrations(CBaseEntity* pEntity);
 	void Migrations_20260121(CBaseEntity* pEntity);
-	void UpdateMapUpdateTime(time_t timeMapUpdated);
+	void Migrations_20260420(CBasePlayerWeapon* pWeapon);
 	bool Migrations20260420Enabled();
+	void UpdateMapUpdateTime(time_t timeMapUpdated);
 	void AddWorkshopDetailsQuery(std::shared_ptr<CMapMigrationWorkshopDetailsQuery> pQuery) { m_vecWorkshopDetailsQueries.push_back(pQuery); }
 	void RemoveWorkshopDetailsQuery(std::shared_ptr<CMapMigrationWorkshopDetailsQuery> pQuery) { m_vecWorkshopDetailsQueries.erase(std::remove(m_vecWorkshopDetailsQueries.begin(), m_vecWorkshopDetailsQueries.end(), pQuery), m_vecWorkshopDetailsQueries.end()); }
 
 private:
 	time_t m_timeMapUpdated = std::numeric_limits<time_t>::max();
 	std::vector<std::shared_ptr<CMapMigrationWorkshopDetailsQuery>> m_vecWorkshopDetailsQueries;
 	std::vector<CHandle<CBaseEntity>> m_vecModelEntitiesUsingRendermodeEnum;
+	std::vector<CHandle<CBasePlayerWeapon>> m_vecEquippedWeapons;
 };
 
 extern CMapMigrations* g_pMapMigrations;