From 7393ac5302286235e82ce7e9feead5bff7c85179 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 18 Jun 2024 18:03:52 -0400 Subject: [PATCH] Fix merge conflicts in PlayTimeTrackingSystem --- .../PlayTimeTracking/PlayTimeTrackingSystem.cs | 11 +---------- .../Preferences/HumanoidCharacterProfile.cs | 6 +++--- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs index 1e10a643f3c..bf226f28349 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs @@ -265,18 +265,9 @@ public void RemoveDisallowedJobs(NetUserId userId, List> j for (var i = 0; i < jobs.Count; i++) { if (_prototypes.TryIndex(jobs[i], out var job) - && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes)) + && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, isWhitelisted)) { -<<<<<<< HEAD - if (JobRequirements.TryRequirementMet(requirement, playTimes, out _, EntityManager, _prototypes, isWhitelisted)) - continue; - - jobs.RemoveSwap(i); - i--; - break; -======= continue; ->>>>>>> 6829630d0c7698d0d8adf1fdb55728164d309341 } jobs.RemoveSwap(i); diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 0b847bdbc11..cca49a4b93d 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -169,9 +169,9 @@ public HumanoidCharacterProfile( /// Copy constructor but with overridable references (to prevent useless copies) private HumanoidCharacterProfile( HumanoidCharacterProfile other, - Dictionary jobPriorities, - List antagPreferences, - List traitPreferences, + Dictionary, JobPriority> jobPriorities, + HashSet> antagPreferences, + HashSet> traitPreferences, Dictionary loadouts) : this(other.Name, other.FlavorText, other.Species, other.Age, other.Sex, other.Gender, other.BankBalance, other.Appearance, other.SpawnPriority, jobPriorities, other.PreferenceUnavailable, antagPreferences, traitPreferences, loadouts)