mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-05-04 09:53:55 -04:00
Merge branch 'master' of https://github.com/codecombat/codecombat
This commit is contained in:
commit
94b98a2d46
2 changed files with 38 additions and 37 deletions
|
@ -129,6 +129,7 @@ module.exports = class TomeView extends View
|
|||
@thangSpells[thang.id].push spellKey
|
||||
unless method.cloneOf
|
||||
skipProtectAPI = @getQueryVariable("skip_protect_api") is "true" or @options.levelID isnt 'brawlwood'
|
||||
skipProtectAPI = true # gah, it's so slow :( and somehow still affects simulation
|
||||
skipFlow = @getQueryVariable("skip_flow") is "true" or @options.levelID is 'brawlwood'
|
||||
spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: skipFlow, skipProtectAPI: skipProtectAPI, worker: @worker
|
||||
for thangID, spellKeys of @thangSpells
|
||||
|
|
|
@ -105,6 +105,7 @@ module.exports.processTaskResult = (req, res) ->
|
|||
return handleTimedOutTask req, res, clientResponseObject if hasTaskTimedOut taskLogJSON.sentDate
|
||||
|
||||
scoringTaskQueue.deleteMessage clientResponseObject.receiptHandle, (err) ->
|
||||
console.log "Deleted message."
|
||||
if err? then return errors.badInput res, "The queue message is already back in the queue, rejecting results."
|
||||
|
||||
logTaskComputation clientResponseObject, taskLog, (logErr) ->
|
||||
|
@ -444,4 +445,3 @@ retrieveOldSessionData = (sessionID, callback) ->
|
|||
"totalScore":session.totalScore ? (25 - 1.8*(25/3))
|
||||
"id": sessionID
|
||||
callback err, oldScoreObject
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue