Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-09 22:55:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix for importing definitions with missing slots

Browse Source
This commit is contained in:
Cmdr McDonald
2016-12-14 08:49:23 +00:00
parent 2a6850ded0
commit 203e9c7b46
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/utils/CompanionApiUtils.js
View File

@@ -224,7 +224,9 @@ export function shipFromJson(json) {
// Now that we know what we're looking for, find it // Now that we know what we're looking for, find it
const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum; const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum;
const hardpointSlot = json.modules[hardpointName]; const hardpointSlot = json.modules[hardpointName];
if (!hardpointSlot.module) { if (!hardpointSlot) {
// This can happen with old imports that don't contain new hardpoints
} else if (!hardpointSlot.module) {
// No module // No module
} else { } else {
const hardpointJson = hardpointSlot.module; const hardpointJson = hardpointSlot.module;
@@ -251,7 +253,9 @@ export function shipFromJson(json) {
} }
internalSlotNum++; internalSlotNum++;
} }
if (!internalSlot.module) { if (!internalSlot) {
// This can happen with old imports that don't contain new slots
} else if (!internalSlot.module) {
// No module // No module
} else { } else {
const internalJson = internalSlot.module; const internalJson = internalSlot.module;