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

Fix Client RoleSystem not inheriting SharedRoleSystem, network job component (#21436)

Browse Source
This commit is contained in:
DrSmugleaf
2023-11-07 14:44:53 -08:00
committed by GitHub
parent 651dffba16
commit dc3b6e31b2
11 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -38,13 +38,13 @@ public sealed partial class BuyerJobCondition : ListingCondition
if (Blacklist != null)
{
if (job?.PrototypeId != null && Blacklist.Contains(job.PrototypeId))
if (job?.Prototype != null && Blacklist.Contains(job.Prototype))
return false;
}
if (Whitelist != null)
{
if (job?.PrototypeId == null || !Whitelist.Contains(job.PrototypeId))
if (job?.Prototype == null || !Whitelist.Contains(job.Prototype))
return false;
}