forked from noxious/server
Merged code
This commit is contained in:
@ -4,6 +4,7 @@ import ZoneRepository from '../../repositories/zoneRepository'
|
||||
import ZoneManager from '../../managers/zoneManager'
|
||||
import { Character, Zone } from '@prisma/client'
|
||||
import logger from '../../utilities/logger'
|
||||
import CharacterManager from '../../managers/characterManager'
|
||||
|
||||
interface IPayload {
|
||||
zoneId: number
|
||||
@ -49,10 +50,12 @@ export default function (socket: TSocket, io: Server) {
|
||||
io.to(zone.id.toString()).emit('zone:character:join', socket.character)
|
||||
|
||||
// add character to zone manager
|
||||
ZoneManager.getZoneById(zone.id)?.addCharacter(socket.character as Character)
|
||||
// ZoneManager.addCharacterToZone(zone.id, socket.character as Character)
|
||||
CharacterManager.initCharacter(socket.character as ExtendedCharacter);
|
||||
// ZoneManager.addCharacterToZone(zone.id, socket.character as Character)
|
||||
|
||||
// send over zone and characters to socket
|
||||
callback({ zone, characters: ZoneManager.getZoneById(zone.id)?.getCharacters() })
|
||||
callback({ zone, characters: CharacterManager.getCharactersInZone(zone) })
|
||||
} catch (error: any) {
|
||||
logger.error(`Error requesting zone: ${error.message}`)
|
||||
socket.disconnect()
|
||||
|
Reference in New Issue
Block a user