Merge pull request #462 from danielyxie/dev

Fixed bug with Player.workForFaction() calling the wrong 'finish' fun…
This commit is contained in:
danielyxie 2018-09-16 14:49:36 -05:00 committed by GitHub
commit 0fc06c3323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

File diff suppressed because one or more lines are too long

@ -1006,7 +1006,7 @@ PlayerObject.prototype.workForFaction = function(numCycles) {
//If timeWorked == 20 hours, then finish. You can only work for the faction for 20 hours
if (overMax || this.timeWorked >= CONSTANTS.MillisecondsPer20Hours) {
return this.finishWork(false);
return this.finishFactionWork(false);
}
var txt = document.getElementById("work-in-progress-text");