much cleaner approach to group lock update

back/src/Model/GameRoom.ts

@@ -23,7 +23,6 @@ import {
     VariableMessage,
     VariableWithTagMessage,
     ServerToClientMessage,
-    LockGroupMessage,
 } from "../Messages/generated/messages_pb";
 import { ProtobufUtils } from "../Model/Websocket/ProtobufUtils";
 import { RoomSocket, ZoneSocket } from "src/RoomManager";
@@ -550,8 +549,8 @@ export class GameRoom {
         this.positionNotifier.emitEmoteEvent(user, emoteEventMessage);
     }
 
-    public emitLockGroupMessage(user: User, lockGroupMessage: LockGroupMessage) {
-        this.positionNotifier.emitLockGroupEvent(user, lockGroupMessage);
+    public emitLockGroupEvent(user: User, groupId: number) {
+        this.positionNotifier.emitLockGroupEvent(user, groupId);
     }
 
     public addRoomListener(socket: RoomSocket) {

back/src/Model/PositionNotifier.ts

@@ -21,7 +21,7 @@ import { Movable } from "_Model/Movable";
 import { PositionInterface } from "_Model/PositionInterface";
 import { ZoneSocket } from "../RoomManager";
 import { User } from "../Model/User";
-import { EmoteEventMessage, LockGroupMessage, SetPlayerDetailsMessage } from "../Messages/generated/messages_pb";
+import { EmoteEventMessage, SetPlayerDetailsMessage } from "../Messages/generated/messages_pb";
 
 interface ZoneDescriptor {
     i: number;
@@ -140,10 +140,10 @@ export class PositionNotifier {
         zone.emitEmoteEvent(emoteEventMessage);
     }
 
-    public emitLockGroupEvent(user: User, lockGroupMessage: LockGroupMessage) {
+    public emitLockGroupEvent(user: User, groupId: number) {
         const zoneDesc = this.getZoneDescriptorFromCoordinates(user.getPosition().x, user.getPosition().y);
         const zone = this.getZone(zoneDesc.i, zoneDesc.j);
-        zone.emitLockGroupEvent(lockGroupMessage);
+        zone.emitLockGroupEvent(groupId);
     }
 
     public *getAllUsersInSquareAroundZone(zone: Zone): Generator<User> {

back/src/Model/Zone.ts

@@ -7,14 +7,13 @@ import {
     EmoteEventMessage,
     SetPlayerDetailsMessage,
     PlayerDetailsUpdatedMessage,
-    LockGroupMessage,
 } from "../Messages/generated/messages_pb";
 
 export type EntersCallback = (thing: Movable, fromZone: Zone | null, listener: ZoneSocket) => void;
 export type MovesCallback = (thing: Movable, position: PositionInterface, listener: ZoneSocket) => void;
 export type LeavesCallback = (thing: Movable, newZone: Zone | null, listener: ZoneSocket) => void;
 export type EmoteCallback = (emoteEventMessage: EmoteEventMessage, listener: ZoneSocket) => void;
-export type LockGroupCallback = (lockGroupMessage: LockGroupMessage, listener: ZoneSocket) => void;
+export type LockGroupCallback = (groupId: number, listener: ZoneSocket) => void;
 export type PlayerDetailsUpdatedCallback = (
     playerDetailsUpdatedMessage: PlayerDetailsUpdatedMessage,
     listener: ZoneSocket
@@ -111,9 +110,9 @@ export class Zone {
         }
     }
 
-    public emitLockGroupEvent(lockGroupMessage: LockGroupMessage) {
+    public emitLockGroupEvent(groupId: number) {
         for (const listener of this.listeners) {
-            this.onLockGroup(lockGroupMessage, listener);
+            this.onLockGroup(groupId, listener);
         }
     }