Fixed left-overs from #293
This commit is contained in:
@ -8,7 +8,7 @@ import { Server as SocketServer } from 'socket.io'
|
||||
import config from '#application/config'
|
||||
import Logger, { LoggerType } from '#application/logger'
|
||||
import Storage from '#application/storage'
|
||||
import { TSocket } from '#application/types'
|
||||
import { TSocket, UUID } from '#application/types'
|
||||
import { Authentication } from '#middleware/authentication'
|
||||
|
||||
class SocketManager {
|
||||
@ -111,12 +111,12 @@ class SocketManager {
|
||||
.emit(event, ...args)
|
||||
}
|
||||
|
||||
public getSocketByUserId(userId: number): TSocket | undefined {
|
||||
public getSocketByUserId(userId: UUID): TSocket | undefined {
|
||||
const sockets = Array.from(this.getIO().sockets.sockets.values())
|
||||
return sockets.find((socket: TSocket) => socket.userId === userId)
|
||||
}
|
||||
|
||||
public getSocketByCharacterId(characterId: number): TSocket | undefined {
|
||||
public getSocketByCharacterId(characterId: UUID): TSocket | undefined {
|
||||
const sockets = Array.from(this.getIO().sockets.sockets.values())
|
||||
return sockets.find((socket: TSocket) => socket.characterId === characterId)
|
||||
}
|
||||
|
@ -1,11 +1,12 @@
|
||||
import Logger, { LoggerType } from '#application/logger'
|
||||
import { UUID } from '#application/types'
|
||||
import { Zone } from '#entities/zone'
|
||||
import LoadedZone from '#models/loadedZone'
|
||||
import ZoneCharacter from '#models/zoneCharacter'
|
||||
import ZoneRepository from '#repositories/zoneRepository'
|
||||
|
||||
class ZoneManager {
|
||||
private readonly zones = new Map<number, LoadedZone>()
|
||||
private readonly zones = new Map<UUID, LoadedZone>()
|
||||
private logger = Logger.type(LoggerType.GAME)
|
||||
|
||||
public async boot(): Promise<void> {
|
||||
@ -21,7 +22,7 @@ class ZoneManager {
|
||||
this.logger.info(`Zone ID ${zone.id} loaded`)
|
||||
}
|
||||
|
||||
public unloadZone(zoneId: number): void {
|
||||
public unloadZone(zoneId: UUID): void {
|
||||
this.zones.delete(zoneId)
|
||||
this.logger.info(`Zone ID ${zoneId} unloaded`)
|
||||
}
|
||||
@ -30,11 +31,11 @@ class ZoneManager {
|
||||
return Array.from(this.zones.values())
|
||||
}
|
||||
|
||||
public getZoneById(zoneId: number): LoadedZone | undefined {
|
||||
public getZoneById(zoneId: UUID): LoadedZone | undefined {
|
||||
return this.zones.get(zoneId)
|
||||
}
|
||||
|
||||
public getCharacterById(characterId: number): ZoneCharacter | undefined {
|
||||
public getCharacterById(characterId: UUID): ZoneCharacter | undefined {
|
||||
for (const zone of this.zones.values()) {
|
||||
const character = zone.getCharactersInZone().find((char) => char.character.id === characterId)
|
||||
if (character) return character
|
||||
@ -42,7 +43,7 @@ class ZoneManager {
|
||||
return undefined
|
||||
}
|
||||
|
||||
public removeCharacter(characterId: number): void {
|
||||
public removeCharacter(characterId: UUID): void {
|
||||
this.zones.forEach((zone) => zone.removeCharacter(characterId))
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user