From 73fa0ecbfc9eabb5fb6a51386fe64632dad99d25 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Tue, 10 Nov 2020 17:00:23 +0100
Subject: [PATCH] Fix init position and trigger layers properties

---
 front/src/Phaser/Game/GameScene.ts | 68 +++++++++++++++++-------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 96648255..d632045f 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -466,35 +466,7 @@ export class GameScene extends ResizableScene implements CenterListener {
 
         // From now, this game scene will be notified of reposition events
         layoutManager.setListener(this);
-
-        this.gameMap.onPropertyChange('openWebsite', (newValue, oldValue) => {
-            if (newValue === undefined) {
-                coWebsiteManager.closeCoWebsite();
-            } else {
-                coWebsiteManager.loadCoWebsite(newValue as string);
-            }
-        });
-        this.gameMap.onPropertyChange('jitsiRoom', (newValue, oldValue, allProps) => {
-            if (newValue === undefined) {
-                this.stopJitsi();
-            } else {
-                if (JITSI_PRIVATE_MODE) {
-                    const adminTag = allProps.get("jitsiRoomAdminTag") as string|undefined;
-
-                    this.connection.emitQueryJitsiJwtMessage(this.instance.replace('/', '-') + "-" + newValue, adminTag);
-                } else {
-                    this.startJitsi(newValue as string);
-                }
-            }
-        })
-
-        this.gameMap.onPropertyChange('silent', (newValue, oldValue) => {
-            if (newValue === undefined || newValue === false || newValue === '') {
-                this.connection.setSilent(false);
-            } else {
-                this.connection.setSilent(true);
-            }
-        });
+        this.triggerOnMapLayerPropertyChange();
 
         const camera = this.cameras.main;
 
@@ -627,14 +599,49 @@ export class GameScene extends ResizableScene implements CenterListener {
                 this.gameMap.setPosition(event.x, event.y);
             })
 
-
             this.scene.wake();
             this.scene.sleep(ReconnectingSceneName);
 
+            //init connection in silent mode
+            this.connection.setSilent(true);
+
+            //init user position and play trigger to check layers properties
+            this.gameMap.setPosition(this.CurrentPlayer.x, this.CurrentPlayer.y);
+
             return connection;
         });
     }
 
+    private triggerOnMapLayerPropertyChange(){
+        this.gameMap.onPropertyChange('openWebsite', (newValue, oldValue) => {
+            if (newValue === undefined) {
+                coWebsiteManager.closeCoWebsite();
+            } else {
+                coWebsiteManager.loadCoWebsite(newValue as string);
+            }
+        });
+        this.gameMap.onPropertyChange('jitsiRoom', (newValue, oldValue, allProps) => {
+            if (newValue === undefined) {
+                this.stopJitsi();
+            } else {
+                if (JITSI_PRIVATE_MODE) {
+                    const adminTag = allProps.get("jitsiRoomAdminTag") as string|undefined;
+
+                    this.connection.emitQueryJitsiJwtMessage(this.instance.replace('/', '-') + "-" + newValue, adminTag);
+                } else {
+                    this.startJitsi(newValue as string);
+                }
+            }
+        })
+        this.gameMap.onPropertyChange('silent', (newValue, oldValue) => {
+            if (newValue === undefined || newValue === false || newValue === '') {
+                this.connection.setSilent(false);
+            } else {
+                this.connection.setSilent(true);
+            }
+        });
+    }
+
     private switchLayoutMode(): void {
         const mode = layoutManager.getLayoutMode();
         if (mode === LayoutMode.Presentation) {
@@ -713,6 +720,7 @@ export class GameScene extends ResizableScene implements CenterListener {
      */
     //todo: push that into the gameManager
     private loadNextGame(layer: ITiledMapLayer, mapWidth: number, roomId: string){
+
         const room = new Room(roomId);
         gameManager.loadMap(room, this.scene);
         const exitSceneKey = roomId;