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

fix: refuse to add items non-fatally #1476

Merged
Sainan merged 2 commits from non-fatal-refusal into main 2025-04-06 06:04:31 -07:00
Conversation 0 Commits 2 Files Changed 1 +15 -12
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e1b97f972d - Show all commits

27
src/services/inventoryService.ts
View File

@ -1071,11 +1071,12 @@ const addCrewShip = (
inventoryChanges: IInventoryChanges = {} inventoryChanges: IInventoryChanges = {}
): IInventoryChanges => { ): IInventoryChanges => {
if (inventory.CrewShips.length != 0) { if (inventory.CrewShips.length != 0) {
throw new Error("refusing to add CrewShip because account already has one"); logger.error("refusing to add CrewShip because account already has one");
} else {
const index = inventory.CrewShips.push({ ItemType: typeName }) - 1;
inventoryChanges.CrewShips ??= [];
inventoryChanges.CrewShips.push(inventory.CrewShips[index].toJSON<IEquipmentClient>());
} }
const index = inventory.CrewShips.push({ ItemType: typeName }) - 1;
inventoryChanges.CrewShips ??= [];
inventoryChanges.CrewShips.push(inventory.CrewShips[index].toJSON<IEquipmentClient>());
return inventoryChanges; return inventoryChanges;
}; };
@ -1085,11 +1086,12 @@ const addCrewShipHarness = (
inventoryChanges: IInventoryChanges = {} inventoryChanges: IInventoryChanges = {}
): IInventoryChanges => { ): IInventoryChanges => {
if (inventory.CrewShipHarnesses.length != 0) { if (inventory.CrewShipHarnesses.length != 0) {
throw new Error("refusing to add CrewShipHarness because account already has one"); logger.error("refusing to add CrewShipHarness because account already has one");
} else {
const index = inventory.CrewShipHarnesses.push({ ItemType: typeName }) - 1;
inventoryChanges.CrewShipHarnesses ??= [];
inventoryChanges.CrewShipHarnesses.push(inventory.CrewShipHarnesses[index].toJSON<IEquipmentClient>());
} }
const index = inventory.CrewShipHarnesses.push({ ItemType: typeName }) - 1;
inventoryChanges.CrewShipHarnesses ??= [];
inventoryChanges.CrewShipHarnesses.push(inventory.CrewShipHarnesses[index].toJSON<IEquipmentClient>());
return inventoryChanges; return inventoryChanges;
}; };
@ -1099,11 +1101,12 @@ const addMotorcycle = (
inventoryChanges: IInventoryChanges = {} inventoryChanges: IInventoryChanges = {}
): IInventoryChanges => { ): IInventoryChanges => {
if (inventory.Motorcycles.length != 0) { if (inventory.Motorcycles.length != 0) {
throw new Error("refusing to add Motorcycle because account already has one"); logger.error("refusing to add Motorcycle because account already has one");
} else {
const index = inventory.Motorcycles.push({ ItemType: typeName }) - 1;
inventoryChanges.Motorcycles ??= [];
inventoryChanges.Motorcycles.push(inventory.Motorcycles[index].toJSON<IEquipmentClient>());
} }
const index = inventory.Motorcycles.push({ ItemType: typeName }) - 1;
inventoryChanges.Motorcycles ??= [];
inventoryChanges.Motorcycles.push(inventory.Motorcycles[index].toJSON<IEquipmentClient>());
return inventoryChanges; return inventoryChanges;
}; };