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

Fixed char move

Browse Source
This commit is contained in:
Dennis Postma
2024-09-09 20:50:14 +02:00
parent 839fec1c06
commit 293b2be919
5 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/character/characterMoveService.ts
View File

@ -26,7 +26,7 @@ export class CharacterMoveService {
}
public async calculatePath(character: ExtendedCharacter, targetX: number, targetY: number): Promise<Array<{ x: number; y: number }> | null> {
const grid = await ZoneManager.getGrid(character.zoneId)
const grid = await ZoneManager.getZoneById(character.zoneId)?.getGrid()
if (!grid?.length) {
logger.error('character:move error', 'Grid not found or empty')
return null

8
src/services/zoneEventTileService.ts
View File

@ -4,6 +4,7 @@ import ZoneRepository from '../repositories/zoneRepository'
import ZoneManager from '../managers/zoneManager'
import { Character, ZoneEventTile, ZoneEventTileTeleport } from '@prisma/client'
import { Server } from 'socket.io'
import CharacterManager from '../managers/characterManager'
export class ZoneEventTileService {
public async handleTeleport(io: Server, socket: TSocket, character: ExtendedCharacter, teleport: ZoneEventTileTeleport): Promise<void> {
@ -12,6 +13,8 @@ export class ZoneEventTileService {
const zone = await ZoneRepository.getById(teleport.toZoneId)
if (!zone) return
// CharacterManager.moveCharacterBetweenZones(character, zone)
const oldZoneId = character.zoneId
const newZoneId = teleport.toZoneId
@ -30,9 +33,6 @@ export class ZoneEventTileService {
character.positionX = teleport.toPositionX
character.positionY = teleport.toPositionY
// Atomic operation in ZoneManager
await ZoneManager.moveCharacterBetweenZones(oldZoneId, newZoneId, character as Character)
// Emit events
io.to(oldZoneId.toString()).emit('zone:character:leave', character.id)
io.to(newZoneId.toString()).emit('zone:character:join', character)
@ -44,7 +44,7 @@ export class ZoneEventTileService {
// Send teleport information to the client
socket.emit('zone:teleport', {
zone,
characters: ZoneManager.getCharactersInZone(zone.id)
characters: CharacterManager.getCharactersInZone(zone)
})
}
}