fix conflicts

2023-10-03 23:34:51 +03:00
parent 9350cdda48 48ad336bba
commit b791681d51
10 changed files with 21 additions and 13 deletions
@@ -20,7 +20,7 @@ public class CashierDesk : BaseInteractableObject
        }
        else
        {
-             _playerJob = _jobsInfoList.First(x => x.JobPosition == player.JobPosition);
+             _playerJob = _jobsInfoList.Where(x => x.JobPosition == player.JobPosition).FirstOrDefault();
            print($"playerJob is {_playerJob}");
            if (_playerJob != null)
            {