_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Hanusiak Piotr
2022-03-02 17:00:43 +01:00
parent ef22d4ba20
commit a0205bf682
13 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
back/src/Model/GameRoom.ts
-2
View File
@@ -551,8 +551,6 @@ export class GameRoom {
}
public emitLockGroupMessage(user: User, lockGroupMessage: LockGroupMessage) {
console.log("D2 GAME ROOM EMIT LOCK GROUP MESSAGE");
console.log(lockGroupMessage.getGroupid());
this.positionNotifier.emitLockGroupEvent(user, lockGroupMessage);
}
back/src/Model/PositionNotifier.ts
-2
View File
@@ -143,8 +143,6 @@ export class PositionNotifier {
public emitLockGroupEvent(user: User, lockGroupMessage: LockGroupMessage) {
const zoneDesc = this.getZoneDescriptorFromCoordinates(user.getPosition().x, user.getPosition().y);
const zone = this.getZone(zoneDesc.i, zoneDesc.j);
console.log("D3 emit from ZONE");
console.log(lockGroupMessage.getGroupid());
zone.emitLockGroupEvent(lockGroupMessage);
}
back/src/Model/Zone.ts
-1
View File
@@ -112,7 +112,6 @@ export class Zone {
}
public emitLockGroupEvent(lockGroupMessage: LockGroupMessage) {
console.log("D4 ZONE ON LOCK GROUP CALLBACK");
for (const listener of this.listeners) {
this.onLockGroup(lockGroupMessage, listener);
}
back/src/RoomManager.ts
-2
View File
@@ -155,8 +155,6 @@ const roomManager: IRoomManagerServer = {
user,
setPlayerDetailsMessage as SetPlayerDetailsMessage
);
} else if (message.hasLockgroupmessage()) {
console.log("===== GOT LOCK GROUP MESSAGE FROM CLIENT =====");
} else {
throw new Error("Unhandled message type");
}
back/src/Services/SocketManager.ts
+4 -11
View File
@@ -70,7 +70,6 @@ function emitZoneMessage(subMessage: SubToPusherMessage, socket: ZoneSocket): vo
// TODO: should we batch those every 100ms?
const batchMessage = new BatchToPusherMessage();
batchMessage.addPayload(subMessage);
socket.write(batchMessage);
}
@@ -277,8 +276,9 @@ export class SocketManager {
},
MINIMUM_DISTANCE,
GROUP_RADIUS,
(thing: Movable, fromZone: Zone | null, listener: ZoneSocket) =>
this.onZoneEnter(thing, fromZone, listener),
(thing: Movable, fromZone: Zone | null, listener: ZoneSocket) => {
this.onZoneEnter(thing, fromZone, listener);
},
(thing: Movable, position: PositionInterface, listener: ZoneSocket) =>
this.onClientMove(thing, position, listener),
(thing: Movable, newZone: Zone | null, listener: ZoneSocket) =>
@@ -393,17 +393,12 @@ export class SocketManager {
private onLockGroup(lockGroupMessage: LockGroupMessage, client: ZoneSocket) {
const subMessage = new SubToPusherMessage();
subMessage.setLockgroupmessage(lockGroupMessage);
console.log("D5 SOCKET MANAGER ON LOCK GROUP");
console.log(lockGroupMessage.getGroupid());
console.log(lockGroupMessage.getLock());
emitZoneMessage(subMessage, client);
}
private onPlayerDetailsUpdated(playerDetailsUpdatedMessage: PlayerDetailsUpdatedMessage, client: ZoneSocket) {
const subMessage = new SubToPusherMessage();
subMessage.setPlayerdetailsupdatedmessage(playerDetailsUpdatedMessage);
emitZoneMessage(subMessage, client);
}
@@ -433,7 +428,6 @@ export class SocketManager {
const subMessage = new SubToPusherMessage();
subMessage.setGroupleftzonemessage(groupDeleteMessage);
emitZoneMessage(subMessage, client);
//user.emitInBatch(subMessage);
}
@@ -445,7 +439,6 @@ export class SocketManager {
const subMessage = new SubToPusherMessage();
subMessage.setUserleftzonemessage(userLeftMessage);
emitZoneMessage(subMessage, client);
}
@@ -667,6 +660,7 @@ export class SocketManager {
const groupUpdateMessage = new GroupUpdateZoneMessage();
groupUpdateMessage.setGroupid(thing.getId());
groupUpdateMessage.setPosition(ProtobufUtils.toPointMessage(thing.getPosition()));
groupUpdateMessage.setLocked(thing.isLocked());
const subMessage = new SubToPusherMessage();
subMessage.setGroupupdatezonemessage(groupUpdateMessage);
@@ -905,7 +899,6 @@ export class SocketManager {
}
handleLockGroupMessage(room: GameRoom, user: User, message: LockGroupMessage) {
console.log("D1 HANDLE LOCK GROUP MESSAGE");
const group = user.group;
if (!group) {
return;