imshvc/noxious_server
1
0
Fork 0
forked from noxious/server
Code Pull Requests Activity

fuk it

Browse Source
This commit is contained in:
Zaxiure
2024-09-20 21:58:38 +02:00
parent b772ade582
commit ed92663313
27 changed files with 117 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/events/zone/characterJoin.ts
View File

@ -23,7 +23,10 @@ interface IResponse {
export default function (socket: TSocket, io: Server) {
socket.on('zone:character:join', async (data: IPayload, callback: (response: IResponse) => void) => {
try {
if (!socket.character) return
if (!socket.characterId) return
const character = CharacterManager.getCharacterFromSocket(socket);
if(!character) return
if (!data.zoneId) {
console.log(`---Zone id not provided.`)
@ -37,19 +40,19 @@ export default function (socket: TSocket, io: Server) {
return
}
if (socket.character?.zoneId) {
socket.leave(socket.character.zoneId.toString())
io.to(socket.character.zoneId.toString()).emit('zone:character:leave', socket.character)
if (character?.zoneId) {
socket.leave(character.zoneId.toString())
io.to(character.zoneId.toString()).emit('zone:character:leave', character)
}
socket.join(zone.id.toString())
// let other clients know of new character
io.to(zone.id.toString()).emit('zone:character:join', socket.character)
io.to(zone.id.toString()).emit('zone:character:join', character)
// add character to zone manager
// ZoneManager.addCharacterToZone(zone.id, socket.character as Character)
CharacterManager.initCharacter(socket.character as ExtendedCharacter)
// CharacterManager.initCharacter(character as ExtendedCharacter)
// ZoneManager.addCharacterToZone(zone.id, socket.character as Character)
// send over zone and characters to socket

15
src/events/zone/characterLeave.ts
View File

@ -1,8 +1,6 @@
import { Server } from 'socket.io'
import { TSocket } from '../../utilities/types'
import ZoneRepository from '../../repositories/zoneRepository'
import ZoneManager from '../../managers/zoneManager'
import { Character, Zone } from '@prisma/client'
import CharacterManager from '../../managers/characterManager'
import logger from '../../utilities/logger'
@ -18,17 +16,18 @@ export default class ZoneLeaveEvent {
private async handleZoneLeave(): Promise<void> {
try {
if (!this.socket.character) {
const character = CharacterManager.getCharacterFromSocket(this.socket);
if (!character) {
logger.error('zone:character:leave error', 'Character not found')
return
}
if (!this.socket.character.zoneId) {
if (!character.zoneId) {
logger.error('zone:character:leave error', 'Character not in a zone')
return
}
const zone = await ZoneRepository.getById(this.socket.character.zoneId)
const zone = await ZoneRepository.getById(character.zoneId)
if (!zone) {
logger.error('zone:character:leave error', 'Zone not found')
@ -38,12 +37,12 @@ export default class ZoneLeaveEvent {
this.socket.leave(zone.id.toString())
// let other clients know of character leaving
this.io.to(zone.id.toString()).emit('zone:character:leave', this.socket.character.id)
this.io.to(zone.id.toString()).emit('zone:character:leave', character.id)
// remove character from zone manager
await CharacterManager.removeCharacter(this.socket.character)
await CharacterManager.removeCharacter(character)
logger.info('zone:character:leave', `Character ${this.socket.character.id} left zone ${zone.id}`)
logger.info('zone:character:leave', `Character ${character.id} left zone ${zone.id}`)
} catch (error: any) {
logger.error('zone:character:leave error', error.message)
}

2
src/events/zone/characterMove.ts
View File

@ -118,7 +118,7 @@ export default class CharacterMove {
}
private async handleZoneEventTile(zoneEventTile: ZoneEventTileWithTeleport): Promise<void> {
const { character } = this.socket
const character = CharacterManager.getCharacterFromSocket(this.socket)
if (!character) {
logger.error('character:move error', 'Character not found')
return