Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop

front/src/Phaser/Game/GameScene.ts

@@ -93,7 +93,7 @@ import { followUsersColorStore } from "../../Stores/FollowStore";
 import { GameSceneUserInputHandler } from "../UserInput/GameSceneUserInputHandler";
 import { i18nJson } from "../../i18n/locales";
 import LL, { locale } from "../../i18n/i18n-svelte";
-import { availabilityStatusStore, localVolumeStore } from "../../Stores/MediaStore";
+import { availabilityStatusStore, denyProximityMeetingStore, localVolumeStore } from "../../Stores/MediaStore";
 import { StringUtils } from "../../Utils/StringUtils";
 import { startLayerNamesStore } from "../../Stores/StartLayerNamesStore";
 import { JitsiCoWebsite } from "../../WebRtc/CoWebsite/JitsiCoWebsite";
@@ -228,7 +228,6 @@ export class GameScene extends DirtyScene {
     private jitsiDominantSpeaker: boolean = false;
     private jitsiParticipantsCount: number = 0;
     public readonly superLoad: SuperLoaderPlugin;
-    private allowProximityMeeting: boolean = true;
 
     constructor(private room: Room, MapUrlFile: string, customKey?: string | undefined) {
         super({
@@ -1147,14 +1146,14 @@ export class GameScene extends DirtyScene {
 
         this.iframeSubscriptionList.push(
             iframeListener.disablePlayerProximityMeetingStream.subscribe(() => {
-                this.allowProximityMeeting = false;
+                denyProximityMeetingStore.set(true);
                 this.disableMediaBehaviors();
             })
         );
 
         this.iframeSubscriptionList.push(
             iframeListener.enablePlayerProximityMeetingStream.subscribe(() => {
-                this.allowProximityMeeting = true;
+                denyProximityMeetingStore.set(false);
                 this.enableMediaBehaviors();
             })
         );
@@ -2225,7 +2224,7 @@ export class GameScene extends DirtyScene {
     }
 
     public enableMediaBehaviors() {
-        if (this.allowProximityMeeting) {
+        if (!get(denyProximityMeetingStore)) {
             mediaManager.showMyCamera();
         }
     }