Fix code for ExtraWarheads/ReturnWeapon concerning FirerHouse

src/Ext/Bullet/Hooks.DetonateLogics.cpp

@@ -302,13 +302,13 @@ DEFINE_HOOK(0x469AA4, BulletClass_Logics_Extras, 0x5)
 	// Extra warheads
 	if (pThis->WeaponType)
 	{
+		auto const pOwner = pThis->Owner ? pThis->Owner->Owner : BulletExt::ExtMap.Find(pThis)->FirerHouse;
 		auto const pWeaponExt = WeaponTypeExt::ExtMap.Find(pThis->WeaponType);
 		int defaultDamage = pThis->WeaponType->Damage;
 
 		for (size_t i = 0; i < pWeaponExt->ExtraWarheads.size(); i++)
 		{
 			auto const pWH = pWeaponExt->ExtraWarheads[i];
-			auto const pOwner = pThis->Owner ? pThis->Owner->Owner : BulletExt::ExtMap.Find(pThis)->FirerHouse;
 			int damage = defaultDamage;
 			size_t size = pWeaponExt->ExtraWarheads_DamageOverrides.size();
 
@@ -359,9 +359,6 @@ DEFINE_HOOK(0x469AA4, BulletClass_Logics_Extras, 0x5)
 				pWeapon->Damage, pWeapon->Warhead, pWeapon->Speed, pWeapon->Bright))
 			{
 				pBullet->WeaponType = pWeapon;
-				auto const pBulletExt = BulletExt::ExtMap.Find(pBullet);
-				pBulletExt->FirerHouse = pBulletExt->FirerHouse;
-
 				pBullet->MoveTo(pThis->Location, BulletVelocity::Empty);
 			}
 		}