OpenWF/SpaceNinjaServer
16
15
Fork 18
Code Issues 38 Pull Requests 4 Actions Packages Projects Releases Activity

fix: handle null in ArchonCrystalUpgrades #2155

Closed
Sainan wants to merge 1 commits from null-fix into main
pull from: null-fix
merge into: OpenWF:main
Conversation 1 Commits 1 Files Changed 3 +6 -6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9a0f112420 - Show all commits

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

@ -60,10 +60,10 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
const suit = inventory.Suits.id(request.SuitId.$oid)!; const suit = inventory.Suits.id(request.SuitId.$oid)!;
const miscItemChanges: IMiscItem[] = []; const miscItemChanges: IMiscItem[] = [];
if (suit.ArchonCrystalUpgrades![request.Slot].Color) { if (suit.ArchonCrystalUpgrades![request.Slot]?.Color) {
// refund shard // refund shard
const shard = Object.entries(colorToShard).find( const shard = Object.entries(colorToShard).find(
([color]) => color == suit.ArchonCrystalUpgrades![request.Slot].Color ([color]) => color == suit.ArchonCrystalUpgrades![request.Slot]!.Color
)![1]; )![1];
miscItemChanges.push({ miscItemChanges.push({
ItemType: shard, ItemType: shard,
@ -83,9 +83,9 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
// >= 38.6.0 // >= 38.6.0
type = type =
archonCrystalRemovalResource[ archonCrystalRemovalResource[
suit.ArchonCrystalUpgrades![request.Slot].Color!.replace("_MYTHIC", "") suit.ArchonCrystalUpgrades![request.Slot]!.Color!.replace("_MYTHIC", "")
]; ];
count = suit.ArchonCrystalUpgrades![request.Slot].Color!.indexOf("_MYTHIC") != -1 ? 300 : 150; count = suit.ArchonCrystalUpgrades![request.Slot]!.Color!.indexOf("_MYTHIC") != -1 ? 300 : 150;
} }
inventory.InfestedFoundry!.Resources!.find(x => x.ItemType == type)!.Count -= count; inventory.InfestedFoundry!.Resources!.find(x => x.ItemType == type)!.Count -= count;
} }

2
src/controllers/custom/popArchonCrystalUpgradeController.ts
View File

@ -8,7 +8,7 @@ export const popArchonCrystalUpgradeController: RequestHandler = async (req, res
const suit = inventory.Suits.id(req.query.oid as string); const suit = inventory.Suits.id(req.query.oid as string);
if (suit && suit.ArchonCrystalUpgrades) { if (suit && suit.ArchonCrystalUpgrades) {
suit.ArchonCrystalUpgrades = suit.ArchonCrystalUpgrades.filter( suit.ArchonCrystalUpgrades = suit.ArchonCrystalUpgrades.filter(
x => x.UpgradeType != (req.query.type as string) x => x && x.UpgradeType != (req.query.type as string)
); );
await inventory.save(); await inventory.save();
res.end(); res.end();

2
src/types/inventoryTypes/commonInventoryTypes.ts
View File

@ -136,7 +136,7 @@ export interface IEquipmentDatabase {
DefensiveUpgrade?: string; DefensiveUpgrade?: string;
UpgradesExpiry?: Date; UpgradesExpiry?: Date;
UmbraDate?: Date; // related to scrapped "echoes of umbra" feature UmbraDate?: Date; // related to scrapped "echoes of umbra" feature
ArchonCrystalUpgrades?: IArchonCrystalUpgrade[]; ArchonCrystalUpgrades?: (IArchonCrystalUpgrade | null)[];
Weapon?: ICrewShipWeapon; Weapon?: ICrewShipWeapon;
Customization?: ICrewShipCustomization; Customization?: ICrewShipCustomization;
RailjackImage?: IFlavourItem; RailjackImage?: IFlavourItem;