Skip to content

Commit

Permalink
fix some missing semis
Browse files Browse the repository at this point in the history
  • Loading branch information
Promises committed Dec 27, 2021
1 parent 64a8513 commit fc31042
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/engine/config/item-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export async function loadItemConfigurations(path: string): Promise<{ items: { [
}
});
}
items[subKey] = item
items[subKey] = item;
items[subKey].groups.forEach((group) => {
if(!itemGroups[group]) {
itemGroups[group] = {};
Expand Down
6 changes: 3 additions & 3 deletions src/engine/util/objects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ export function deepMerge<T>(objectA: T, objectB: T): T {
}
if(Array.isArray(objectA[key])) {
if(!Array.isArray(objectB[key])) {
newObject[key] = [...objectA[key], objectB[key]]
newObject[key] = [...objectA[key], objectB[key]];
return;
}
newObject[key] = deepMerge(objectA[key], objectB[key]);
return;
}
if(Array.isArray(objectB[key])) {
if(!Array.isArray(objectA[key])) {
newObject[key] = [...objectB[key], objectA[key]]
newObject[key] = [...objectB[key], objectA[key]];
return;
}
console.error('Something is wrong with deepmerger', key, objectA, objectB);
Expand All @@ -46,7 +46,7 @@ export function deepMerge<T>(objectA: T, objectB: T): T {
}
newObject[key] = objectA[key];
})
return newObject
return newObject;
}
return objectA;
}
16 changes: 8 additions & 8 deletions src/plugins/commands/groups-debug.plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ import { findItemTagsInGroup, findItemTagsInGroupFilter } from '@engine/config/c
const selectGroups: commandActionHandler = ({ player, args, isConsole }) => {
const groups: string | number = args.groupkeys;
if(!groups || typeof groups !== 'string') {
player.sendLogMessage('invalid input', isConsole)
return
player.sendLogMessage('invalid input', isConsole);
return;
}
player.sendLogMessage('results:', isConsole)
player.sendLogMessage('results:', isConsole);
findItemTagsInGroup(groups.split(',')).forEach((itemName) => {
player.sendLogMessage(itemName, isConsole);
})
});
return;
};

const filterGroups: commandActionHandler = ({ player, args, isConsole }) => {
const groups: string | number = args.groupkeys;
if(!groups || typeof groups !== 'string') {
player.sendLogMessage('invalid input', isConsole)
return
player.sendLogMessage('invalid input', isConsole);
return;
}

player.sendLogMessage('results:', isConsole)
player.sendLogMessage('results:', isConsole);
findItemTagsInGroupFilter(groups.split(',')).forEach((itemName) => {
player.sendLogMessage(itemName, isConsole);
})
});
return;
};

Expand Down

0 comments on commit fc31042

Please sign in to comment.