Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix BuyerJobCondition not being checked when the user has no job (#19726)

Browse Source
This commit is contained in:
DrSmugleaf
2023-09-01 00:24:36 -07:00
committed by GitHub
parent b1e2112211
commit 895e5de553
2 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
View File

@@ -37,17 +37,13 @@ public sealed partial class BuyerDepartmentCondition : ListingCondition
return true;
var jobs = ent.System<SharedJobSystem>();
if (jobs.MindTryGetJob(mindId, out var job, out _))
{
if (Blacklist != null)
jobs.MindTryGetJob(mindId, out var job, out _);
if (Blacklist != null && job?.PrototypeId != null)
{
foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
{
if (job.PrototypeId == null ||
!department.Roles.Contains(job.PrototypeId) ||
!Blacklist.Contains(department.ID))
continue;
if (department.Roles.Contains(job.PrototypeId) && Blacklist.Contains(department.ID))
return false;
}
}
@@ -55,21 +51,22 @@ public sealed partial class BuyerDepartmentCondition : ListingCondition
if (Whitelist != null)
{
var found = false;
if (job?.PrototypeId != null)
{
foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
{
if (job.PrototypeId == null ||
!department.Roles.Contains(job.PrototypeId) ||
!Whitelist.Contains(department.ID))
continue;
if (department.Roles.Contains(job.PrototypeId) && Whitelist.Contains(department.ID))
{
found = true;
break;
}
}
}
if (!found)
return false;
}
}
return true;
}

9
Content.Server/Store/Conditions/BuyerJobCondition.cs
View File

@@ -34,20 +34,19 @@ public sealed partial class BuyerJobCondition : ListingCondition
return true;
var jobs = ent.System<SharedJobSystem>();
if (jobs.MindTryGetJob(mindId, out var job, out _))
{
jobs.MindTryGetJob(mindId, out var job, out _);
if (Blacklist != null)
{
if (job.PrototypeId != null && Blacklist.Contains(job.PrototypeId))
if (job?.PrototypeId != null && Blacklist.Contains(job.PrototypeId))
return false;
}
if (Whitelist != null)
{
if (job.PrototypeId == null || !Whitelist.Contains(job.PrototypeId))
if (job?.PrototypeId == null || !Whitelist.Contains(job.PrototypeId))
return false;
}
}
return true;
}