jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an error where incorrectly targeted effects would cause computation error

Browse Source
This commit is contained in:
Thaum Rystra
2020-05-15 17:27:34 +02:00
parent 3af48649f7
commit 2c988b8717
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/imports/api/creature/computation/ComputationMemo.js
View File

@@ -89,7 +89,7 @@ export default class ComputationMemo {
if (this.statsByVariableName[variableName]){ if (this.statsByVariableName[variableName]){
prop.value = NaN; prop.value = NaN;
prop.computationDetails.error = 'variableNameCollision'; prop.computationDetails.error = 'variableNameCollision';
console.warn('variableNameCollision', prop); if (Meteor.isClient) console.warn('variableNameCollision', prop);
return; return;
} }
this.statsByVariableName[variableName] = prop; this.statsByVariableName[variableName] = prop;
@@ -111,7 +111,9 @@ export default class ComputationMemo {
prop = this.registerProperty(prop); prop = this.registerProperty(prop);
let targets = this.getEffectTargets(prop); let targets = this.getEffectTargets(prop);
targets.forEach(target => { targets.forEach(target => {
target.computationDetails.effects.push(prop); if (target.computationDetails.effects){
target.computationDetails.effects.push(prop);
}
}); });
if (!targets.size){ if (!targets.size){
this.unassignedEffects.push(prop); this.unassignedEffects.push(prop);

2
app/imports/api/creature/computation/computeStat.js
View File

@@ -13,7 +13,7 @@ export default function computeStat(stat, memo){
stat.value = NaN; stat.value = NaN;
stat.computationDetails.busyComputing = false; stat.computationDetails.busyComputing = false;
stat.computationDetails.error = 'dependencyLoop'; stat.computationDetails.error = 'dependencyLoop';
console.warn('dependencyLoop', stat); if (Meteor.isClient) console.warn('dependencyLoop', stat);
return; return;
} }
// Before doing any work, mark this stat as busy // Before doing any work, mark this stat as busy

5
app/imports/api/creature/computation/writeAlteredProperties.js
View File

@@ -84,7 +84,10 @@ function bulkWriteProperties(bulkWriteOps){
bulkWriteOps, bulkWriteOps,
{ordered : false}, {ordered : false},
function(e){ function(e){
if (e) console.error(e); if (e) {
console.error('Bulk write failed: ');
console.error(e);
}
} }
); );
} else { } else {