OpenWF/SpaceNinjaServer
28
29
Fork 35
Code Issues 23 Pull Requests 1 Actions Packages Projects Releases Activity

fix: ensure that only one CrewMember is ever on call #2069

Merged
Sainan merged 1 commits from oncall-fix into main 2025-05-13 08:25:10 -07:00
Conversation 0 Commits 1 Files Changed 2 +9 -1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5eda199da8 - Show all commits

8
src/controllers/api/crewMembersController.ts
View File

@ -15,6 +15,14 @@ export const crewMembersController: RequestHandler = async (req, res) => {
dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx; dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx;
dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid); dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid);
dbCrewMember.Configs = data.crewMember.Configs; dbCrewMember.Configs = data.crewMember.Configs;
if (data.crewMember.SecondInCommand) {
for (const cm of inventory.CrewMembers) {
if (cm.SecondInCommand) {
cm.SecondInCommand = false;
break;
}
}
}
dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand; dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand;
await inventory.save(); await inventory.save();
res.json({ res.json({

2
src/services/missionInventoryUpdateService.ts
View File

@ -631,7 +631,7 @@ export const addMissionInventoryUpdates = async (
Rank: inventory.Nemesis.Rank, Rank: inventory.Nemesis.Rank,
Traded: inventory.Nemesis.Traded, Traded: inventory.Nemesis.Traded,
PrevOwners: inventory.Nemesis.PrevOwners, PrevOwners: inventory.Nemesis.PrevOwners,
SecondInCommand: inventory.Nemesis.SecondInCommand, SecondInCommand: false,
Weakened: inventory.Nemesis.Weakened, Weakened: inventory.Nemesis.Weakened,
// And set killed flag // And set killed flag
k: value.killed k: value.killed