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

front/src/Phaser/Game/GameScene.ts

@@ -76,7 +76,7 @@ import { userIsAdminStore } from "../../Stores/GameStore";
 import { contactPageStore } from "../../Stores/MenuStore";
 import type { WasCameraUpdatedEvent } from "../../Api/Events/WasCameraUpdatedEvent";
 import { audioManagerFileStore } from "../../Stores/AudioManagerStore";
-import { currentPlayerGroupIdStore, currentPlayerGroupLockStateStore } from "../../Stores/CurrentPlayerGroupStore";
+import { currentPlayerGroupLockStateStore } from "../../Stores/CurrentPlayerGroupStore";
 
 import EVENT_TYPE = Phaser.Scenes.Events;
 import Texture = Phaser.Textures.Texture;
@@ -727,10 +727,6 @@ export class GameScene extends DirtyScene {
             }
         });
 
-        this.currentPlayerGroupIdStoreUnsubscribe = currentPlayerGroupIdStore.subscribe((groupId) => {
-            this.currentPlayerGroupId = groupId;
-        });
-
         Promise.all([
             this.connectionAnswerPromiseDeferred.promise as Promise<unknown>,
             ...scriptPromises,
@@ -863,8 +859,7 @@ export class GameScene extends DirtyScene {
                 });
 
                 this.connection.groupUsersUpdateMessageStream.subscribe((message) => {
-                    // TODO: how else can we deduce our current group?
-                    currentPlayerGroupIdStore.set(message.groupId);
+                    this.currentPlayerGroupId = message.groupId;
                 });
 
                 /**
@@ -1905,7 +1900,6 @@ export class GameScene extends DirtyScene {
                     break;
                 case "DeleteGroupEvent": {
                     this.doDeleteGroup(event.groupId);
-                    currentPlayerGroupIdStore.set(undefined);
                     currentPlayerGroupLockStateStore.set(undefined);
                     break;
                 }

front/src/Phaser/UserInput/UserInputManager.ts

@@ -280,6 +280,9 @@ export class UserInputManager {
         );
 
         this.scene.input.keyboard.on("keyup-SPACE", (event: Event) => {
+            if (this.isInputDisabled) {
+                return;
+            }
             this.userInputHandler.handleSpaceKeyUpEvent(event);
         });
     }