OOP is my passion ( ͡° ͜ʖ ͡°)

src/events/gameMaster/assetManager/characterHair/delete.ts

@@ -1,6 +1,6 @@
 import { BaseEvent } from '#application/base/baseEvent'
-import CharacterHairRepository from '#repositories/characterHairRepository'
 import { UUID } from '#application/types'
+import CharacterHairRepository from '#repositories/characterHairRepository'
 
 interface IPayload {
   id: UUID

src/events/gameMaster/assetManager/characterHair/update.ts

@@ -29,7 +29,7 @@ export default class CharacterHairUpdateEvent extends BaseEvent {
         return callback(false)
       }
 
-      await characterHair.setName(data.name).setGender(data.gender).setIsSelectable(data.isSelectable).setSprite(sprite!).update()
+      await characterHair.setName(data.name).setGender(data.gender).setIsSelectable(data.isSelectable).setSprite(sprite).update()
       return callback(true)
     } catch (error) {
       this.logger.error(`Error updating character hair: ${error instanceof Error ? error.message : String(error)}`)

src/events/gameMaster/assetManager/characterType/delete.ts

@@ -1,6 +1,6 @@
+import { BaseEvent } from '#application/base/baseEvent'
 import { UUID } from '#application/types'
 import CharacterTypeRepository from '#repositories/characterTypeRepository'
-import { BaseEvent } from '#application/base/baseEvent'
 
 interface IPayload {
   id: UUID

src/events/gameMaster/assetManager/characterType/list.ts

@@ -1,6 +1,6 @@
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
 import { BaseEvent } from '#application/base/baseEvent'
 import { CharacterType } from '#entities/characterType'
+import CharacterTypeRepository from '#repositories/characterTypeRepository'
 
 interface IPayload {}
 

src/events/gameMaster/assetManager/mapObject/list.ts

@@ -1,6 +1,6 @@
-import ObjectRepository from '#repositories/mapObjectRepository'
 import { BaseEvent } from '#application/base/baseEvent'
 import { MapObject } from '#entities/mapObject'
+import ObjectRepository from '#repositories/mapObjectRepository'
 
 interface IPayload {}
 

src/events/gameMaster/assetManager/mapObject/remove.ts

@@ -1,8 +1,9 @@
 import fs from 'fs'
-import Storage from '#application/storage'
+
 import { BaseEvent } from '#application/base/baseEvent'
-import MapObjectRepository from '#repositories/mapObjectRepository'
+import Storage from '#application/storage'
 import { UUID } from '#application/types'
+import MapObjectRepository from '#repositories/mapObjectRepository'
 
 interface IPayload {
   mapObjectId: UUID

src/events/gameMaster/assetManager/mapObject/update.ts

@@ -1,5 +1,5 @@
-import { UUID } from '#application/types'
 import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
 import MapObjectRepository from '#repositories/mapObjectRepository'
 
 type Payload = {
@@ -26,16 +26,7 @@ export default class MapObjectUpdateEvent extends BaseEvent {
       const mapObject = await MapObjectRepository.getById(data.id)
       if (!mapObject) return callback(false)
 
-      await mapObject
-        .setName(data.name)
-        .setTags(data.tags)
-        .setOriginX(data.originX)
-        .setOriginY(data.originY)
-        .setIsAnimated(data.isAnimated)
-        .setFrameRate(data.frameRate)
-        .setFrameWidth(data.frameWidth)
-        .setFrameHeight(data.frameHeight)
-        .update()
+      await mapObject.setName(data.name).setTags(data.tags).setOriginX(data.originX).setOriginY(data.originY).setIsAnimated(data.isAnimated).setFrameRate(data.frameRate).setFrameWidth(data.frameWidth).setFrameHeight(data.frameHeight).update()
 
       return callback(true)
     } catch (error) {

src/events/gameMaster/assetManager/mapObject/upload.ts

@@ -2,8 +2,9 @@ import fs from 'fs/promises'
 import { writeFile } from 'node:fs/promises'
 
 import sharp from 'sharp'
-import Storage from '#application/storage'
+
 import { BaseEvent } from '#application/base/baseEvent'
+import Storage from '#application/storage'
 import { MapObject } from '#entities/mapObject'
 
 interface IObjectData {

src/events/gameMaster/mapEditor/request.ts

@@ -1,8 +1,8 @@
 import { BaseEvent } from '#application/base/baseEvent'
+import Database from '#application/database'
 import { UUID } from '#application/types'
 import { Map } from '#entities/map'
 import MapRepository from '#repositories/mapRepository'
-import Database from '#application/database'
 
 interface IPayload {
   mapId: UUID
@@ -26,14 +26,13 @@ export default class MapRequestEvent extends BaseEvent {
 
       const map = await MapRepository.getById(data.mapId)
 
-
       if (!map) {
         this.logger.info(`User ${(await this.getCharacter())!.getId()} tried to request map ${data.mapId} but it does not exist.`)
         return callback(null)
       }
 
       console.log(map)
-      await Database.getEntityManager().populate(map, ['mapEventTiles', 'placedMapObjects'])
+      // await Database.getEntityManager().populate(map, ['mapEventTiles', 'placedMapObjects'])
 
       return callback(map)
     } catch (error: any) {

src/events/gameMaster/mapEditor/update.ts

@@ -5,9 +5,9 @@ import { Map } from '#entities/map'
 import { MapEffect } from '#entities/mapEffect'
 import { MapEventTile } from '#entities/mapEventTile'
 import { MapEventTileTeleport } from '#entities/mapEventTileTeleport'
+import { PlacedMapObject } from '#entities/placedMapObject'
 import mapManager from '#managers/mapManager'
 import MapRepository from '#repositories/mapRepository'
-import { PlacedMapObject } from '#entities/placedMapObject'
 
 interface IPayload {
   mapId: UUID
@@ -83,7 +83,7 @@ export default class MapUpdateEvent extends BaseEvent {
 
         if (tile.teleport) {
           const teleport = new MapEventTileTeleport()
-            .setToMap((await MapRepository.getById(tile.teleport.toMapId))!)
+            .setToMap(await MapRepository.getById(tile.teleport.toMapId))
             .setToPositionX(tile.teleport.toPositionX)
             .setToPositionY(tile.teleport.toPositionY)
             .setToRotation(tile.teleport.toRotation)