lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Manage Local Storage customers player error

Browse source
This commit is contained in:
Gregoire Parant 2020-12-18 13:56:25 +01:00
parent 84de023d82
commit f5dd5efc0e
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
front/src/Phaser/Entity/Character.ts
View file

@ -106,7 +106,9 @@ export abstract class Character extends Container {
}); });
}) })
// Needed, otherwise, animations are not handled correctly. // Needed, otherwise, animations are not handled correctly.
this.scene.sys.updateList.add(sprite); if(this.scene) {
this.scene.sys.updateList.add(sprite);
}
this.sprites.set(texture, sprite); this.sprites.set(texture, sprite);
} }
} }
@ -229,7 +231,9 @@ export abstract class Character extends Container {
this.scene.events.removeListener('postupdate', this.postupdate.bind(this)); this.scene.events.removeListener('postupdate', this.postupdate.bind(this));
} }
for (const sprite of this.sprites.values()) { for (const sprite of this.sprites.values()) {
this.scene.sys.updateList.remove(sprite); if(this.scene) {
this.scene.sys.updateList.remove(sprite);
}
} }
super.destroy(fromScene); super.destroy(fromScene);
this.playerName.destroy(); this.playerName.destroy();

17
front/src/Phaser/Game/GameScene.ts
View file

@ -63,6 +63,7 @@ import {urlManager} from "../../Url/UrlManager";
import {PresentationModeIcon} from "../Components/PresentationModeIcon"; import {PresentationModeIcon} from "../Components/PresentationModeIcon";
import {ChatModeIcon} from "../Components/ChatModeIcon"; import {ChatModeIcon} from "../Components/ChatModeIcon";
import {OpenChatIcon, openChatIconName} from "../Components/OpenChatIcon"; import {OpenChatIcon, openChatIconName} from "../Components/OpenChatIcon";
import {SelectCharacterScene, SelectCharacterSceneName} from "../Login/SelectCharacterScene";
export interface GameSceneInitInterface { export interface GameSceneInitInterface {
initPosition: PointInterface|null, initPosition: PointInterface|null,
@ -375,7 +376,13 @@ export class GameScene extends ResizableScene implements CenterListener {
mediaManager.setUserInputManager(this.userInputManager); mediaManager.setUserInputManager(this.userInputManager);
//notify game manager can to create currentUser in map //notify game manager can to create currentUser in map
this.createCurrentPlayer(); try {
this.createCurrentPlayer();
}catch (err){
//permit to return on character custom if any there any changes frame in the new version
gameManager.leaveGame(this, SelectCharacterSceneName, new SelectCharacterScene());
throw 'characterLayers are not invalid';
}
//initialise camera //initialise camera
this.initCamera(); this.initCamera();
@ -670,8 +677,12 @@ export class GameScene extends ResizableScene implements CenterListener {
public cleanupClosingScene(): void { public cleanupClosingScene(): void {
// We are completely destroying the current scene to avoid using a half-backed instance when coming back to the same map. // We are completely destroying the current scene to avoid using a half-backed instance when coming back to the same map.
this.connection.closeConnection(); if(this.connection) {
this.simplePeer.unregister(); this.connection.closeConnection();
}
if(this.simplePeer) {
this.simplePeer.unregister();
}
} }
private switchLayoutMode(): void { private switchLayoutMode(): void {