Fixed char move

src/events/zone/characterLeave.ts

@@ -3,6 +3,7 @@ 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'
 
 /**
  * Handle character zone leave event
@@ -11,22 +12,17 @@ import { Character, Zone } from '@prisma/client'
  */
 export default function (socket: TSocket, io: Server) {
   socket.on('zone:character:leave', async () => {
-    console.log(`---Socket ${socket.character?.id} has leaved zone.`)
-
     if (!socket.character) {
-      console.log('Socket leaved zone but had no character set')
       return
     }
 
     if (!socket.character.zoneId) {
-      console.log(`---Zone id not provided.`)
       return
     }
 
     const zone = await ZoneRepository.getById(socket.character.zoneId)
 
     if (!zone) {
-      console.log(`---Zone not found.`)
       return
     }
 
@@ -36,7 +32,7 @@ export default function (socket: TSocket, io: Server) {
     io.to(zone.id.toString()).emit('zone:character:leave', socket.character)
 
     // add character to zone manager
-    ZoneManager.removeCharacterFromZone(zone.id, socket.character as Character)
+    CharacterManager.removeCharacter(socket.character)
   })
 }
 

src/models/zone/loadedZone.ts

@@ -1,10 +1,10 @@
-import { Character, Zone } from '@prisma/client'
+import { Zone } from '@prisma/client'
-import ZoneCharacter from './zoneCharacter'
 import zoneRepository from '../../repositories/zoneRepository'
+import characterManager from '../../managers/characterManager'
+import { ExtendedCharacter } from '../../utilities/types'
 
 class LoadedZone {
   private readonly zone: Zone
-  private characters: ZoneCharacter[] = []
   // private readonly npcs: ZoneNPC[] = []
   private readonly grid: number[][] = []
 
@@ -16,17 +16,8 @@ class LoadedZone {
     return this.zone
   }
 
-  public getCharacters(): ZoneCharacter[] {
+  public getCharacters(): ExtendedCharacter[] {
-    return this.characters
+    return characterManager.getCharactersInZone(this.zone);
-  }
-
-  public addCharacter(character: Character): void {
-    const zoneCharacter = new ZoneCharacter(character)
-    this.characters.push(zoneCharacter)
-  }
-
-  public removeCharacter(character: Character): void {
-    this.characters = this.characters.filter((zoneCharacter) => zoneCharacter.getCharacter().id !== character.id)
   }
 
   public async getGrid(): Promise<number[][]> {

src/models/zone/zoneCharacter.ts

@@ -1,14 +0,0 @@
-import { Character } from '@prisma/client'
-
-export default class ZoneCharacter {
-  private readonly character: Character
-  private isMoving: boolean = false
-
-  constructor(character: Character) {
-    this.character = character
-  }
-
-  public getCharacter(): Character {
-    return this.character
-  }
-}

src/services/character/characterMoveService.ts

@@ -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

src/services/zoneEventTileService.ts

@@ -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)
     })
   }
 }