codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 00:28:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:LightAndLight/codecombat

Browse source
This commit is contained in:
Isaac 2014-02-11 04:33:12 +10:00
commit 23554315e2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lib/God.coffee
View file

@ -183,8 +183,10 @@ class Angel
@started = null @started = null
clearInterval @purgatoryTimer clearInterval @purgatoryTimer
@purgatoryTimer = null @purgatoryTimer = null
@worker?.terminate() if @worker
@worker = null worker = @worker
_.defer -> worker.terminate
@worker = null
@ @
abort: -> abort: ->

2
app/views/play/level/tome/tome_view.coffee
View file

@ -89,7 +89,7 @@ module.exports = class TomeView extends View
spellKey = pathComponents.join '/' spellKey = pathComponents.join '/'
@thangSpells[thang.id].push spellKey @thangSpells[thang.id].push spellKey
unless method.cloneOf unless method.cloneOf
spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: @getQueryVariable("skip_flow") is "true", skipProtectAPI: @getQueryVariable("skip_protect_api") is "true" spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: @getQueryVariable("skip_flow") is "true", skipProtectAPI: true #@getQueryVariable("skip_protect_api") is "true"
for thangID, spellKeys of @thangSpells for thangID, spellKeys of @thangSpells
thang = world.getThangByID thangID thang = world.getThangByID thangID
if thang if thang