Merge branch 'master' into production

This commit is contained in:
phoenixeliot 2016-06-14 13:03:52 -07:00
commit b95a051d63

View file

@ -178,7 +178,7 @@ module.exports = class LevelLoader extends CocoClass
if heroResource = @maybeLoadURL(url, ThangType, 'thang')
console.log "Pushing resource: ", heroResource
@worldNecessities.push heroResource
@sessionDependenciesRegistered[session.id] = true
@sessionDependenciesRegistered[session.id] = true
return
return unless @level.get('type', true) in ['hero', 'hero-ladder', 'hero-coop']
heroConfig = session.get('heroConfig')