Skip to content

Commit 815b9eb

Browse files
author
Julien Poulton
committed
Merge branch 'master' into '5478-sdk-long-stderr-in-3-player-mode-has-no-scrollbar'
# Conflicts: # playground/misc/misc-3-release-notes.md
2 parents 4d94e66 + acfe6b4 commit 815b9eb

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

engine/core/src/main/resources/view/core/Drawer.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ export class Drawer {
7272
handleModuleError (name, error) {
7373
ErrorLog.push(new ModuleError(name, error))
7474
console.error(error)
75+
ErrorLog.push({
76+
message: `< module "${name}" disabled >\n`
77+
})
78+
delete this.modules[name]
7579
}
7680

7781
instantiateModules () {
@@ -418,11 +422,15 @@ export class Drawer {
418422
for (let moduleName in this.modules) {
419423
const module = this.modules[moduleName]
420424
var stage = new PIXI.Container()
421-
module.reinitScene(stage, {
422-
width: scope.canvasWidth,
423-
height: scope.canvasHeight,
424-
oversampling: this.oversampling
425-
})
425+
try {
426+
module.reinitScene(stage, {
427+
width: scope.canvasWidth,
428+
height: scope.canvasHeight,
429+
oversampling: this.oversampling
430+
})
431+
} catch (error) {
432+
this.handleModuleError(moduleName, error)
433+
}
426434
container.addChild(stage)
427435
}
428436
}
@@ -513,10 +521,6 @@ export class Drawer {
513521
module.animateScene(step)
514522
} catch (e) {
515523
this.handleModuleError(moduleName, e)
516-
ErrorLog.push({
517-
message: `< module ${moduleName} disabled >`
518-
})
519-
module.animateScene = null
520524
}
521525
}
522526
}

engine/core/src/main/resources/view/core/ModuleError.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export class ModuleError extends Error {
22
constructor (moduleName, cause) {
3-
super('Error in module ' + moduleName)
3+
super('< Error in module "' + moduleName + '" >')
44
this.cause = cause
55
this.name = 'ModuleError'
66
}

playground/misc/misc-3-release-notes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
The CodinGame SDK is regularly updated and improved. This document lets you know what changed in the latest releases.
44

5-
# Next Release
5+
## Next Release
66

77
### 🐞 Bug fix
88

99
- Improved display of player output in local test page.
10+
- Better handling of errors from initializing modules
1011

1112
## 3.3.1
1213

0 commit comments

Comments
 (0)