Merge branch 'master' into dev

This commit is contained in:
Danielv123 committed 2017-04-21 09:22:48 +02:00
commit 6449fef1e1
3 files changed
+29 -8

No files matched your search

+13 -5
View File
@@ -246,10 +246,11 @@ write-data=__PATH__executable__/../../../instances/" + instance + "\r\n\
client.connect();
}
});
/*
serverprocess.stdout.on('data', (chunk) => {
console.log('OUT: ' + chunk);
})*/
if(process.platform == "linux"){
console.log('Factorio: ' + chunk);
}
})
serverprocess.stderr.on('data', (chunk) => {
console.log('ERR: ' + chunk);
@@ -542,17 +543,24 @@ function instanceManagement() {
items[i][0] = items[i][0].replace("\u0000", "");
items[i][0] = items[i][0].replace(",", "");
if (preparedPackage[items[i][0]]) {
// if we have buffered some already, sum the new items
if (typeof Number(preparedPackage[items[i][0]].count) == "number" && typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {
"name": items[i][0],
"count": Number(preparedPackage[items[i][0]].count) + Number(items[i][1])
"count": Number(preparedPackage[items[i][0]].count) + Number(items[i][1]),
"instanceName":instance,
"instanceID":instanceconfig.unique,
};
// else just add em in without summing
} else if (typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {
"name": items[i][0],
"count": Number(items[i][1])
"count": Number(items[i][1]),
"instanceName":instance,
"instanceID":instanceconfig.unique,
};
}
// this condition will NEVER be triggered but we know how that goes
} else if (typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {
"name": items[i][0],