tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply RoleLoadout MinLimit fix to EnsureValid too (#29358)

Browse Source 
Apply MinLimit fix to EnsureValid too
This commit is contained in:
Tayrtahn
2024-06-22 22:17:28 -04:00
committed by GitHub
parent 0546c9bf64
commit c2f8984e6c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Preferences/Loadouts/RoleLoadout.cs
View File

@@ -124,9 +124,12 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
// If you put invalid ones first but that's your fault for not using sensible defaults // If you put invalid ones first but that's your fault for not using sensible defaults
if (loadouts.Count < groupProto.MinLimit) if (loadouts.Count < groupProto.MinLimit)
{ {
for (var i = 0; i < Math.Min(groupProto.MinLimit, groupProto.Loadouts.Count); i++) foreach (var protoId in groupProto.Loadouts)
{ {
if (!protoManager.TryIndex(groupProto.Loadouts[i], out var loadoutProto)) if (loadouts.Count >= groupProto.MinLimit)
break;
if (!protoManager.TryIndex(protoId, out var loadoutProto))
continue; continue;
var defaultLoadout = new Loadout() var defaultLoadout = new Loadout()
@@ -193,11 +196,10 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
if (groupProto.MinLimit > 0) if (groupProto.MinLimit > 0)
{ {
// Apply any loadouts we can. // Apply any loadouts we can.
var addedCount = 0;
foreach (var protoId in groupProto.Loadouts) foreach (var protoId in groupProto.Loadouts)
{ {
// Reached the limit, time to stop // Reached the limit, time to stop
if (addedCount >= groupProto.MinLimit) if (loadouts.Count >= groupProto.MinLimit)
break; break;
if (!protoManager.TryIndex(protoId, out var loadoutProto)) if (!protoManager.TryIndex(protoId, out var loadoutProto))
@@ -214,7 +216,6 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
loadouts.Add(defaultLoadout); loadouts.Add(defaultLoadout);
Apply(loadoutProto); Apply(loadoutProto);
addedCount++;
} }
} }
} }