From f5dd5efc0ea92c6a2e261c890581919d2e214caf Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Fri, 18 Dec 2020 13:56:25 +0100
Subject: [PATCH] Manage Local Storage customers player error

---
 front/src/Phaser/Entity/Character.ts |  8 ++++++--
 front/src/Phaser/Game/GameScene.ts   | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/front/src/Phaser/Entity/Character.ts b/front/src/Phaser/Entity/Character.ts
index a1ed30d5..13d0b637 100644
--- a/front/src/Phaser/Entity/Character.ts
+++ b/front/src/Phaser/Entity/Character.ts
@@ -106,7 +106,9 @@ export abstract class Character extends Container {
                 });
             })
             // 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);
         }
     }
@@ -229,7 +231,9 @@ export abstract class Character extends Container {
             this.scene.events.removeListener('postupdate', this.postupdate.bind(this));
         }
         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);
         this.playerName.destroy();
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index a5248ff7..8ac7ef85 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -63,6 +63,7 @@ import {urlManager} from "../../Url/UrlManager";
 import {PresentationModeIcon} from "../Components/PresentationModeIcon";
 import {ChatModeIcon} from "../Components/ChatModeIcon";
 import {OpenChatIcon, openChatIconName} from "../Components/OpenChatIcon";
+import {SelectCharacterScene, SelectCharacterSceneName} from "../Login/SelectCharacterScene";
 
 export interface GameSceneInitInterface {
     initPosition: PointInterface|null,
@@ -375,7 +376,13 @@ export class GameScene extends ResizableScene implements CenterListener {
         mediaManager.setUserInputManager(this.userInputManager);
 
         //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
         this.initCamera();
@@ -670,8 +677,12 @@ export class GameScene extends ResizableScene implements CenterListener {
 
     public cleanupClosingScene(): void {
         // We are completely destroying the current scene to avoid using a half-backed instance when coming back to the same map.
-        this.connection.closeConnection();
-        this.simplePeer.unregister();
+        if(this.connection) {
+            this.connection.closeConnection();
+        }
+        if(this.simplePeer) {
+            this.simplePeer.unregister();
+        }
     }
 
     private switchLayoutMode(): void {