From 47ec425acf0fe9a7785cd1fed93c2cd44351d2cd Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Sat, 4 Jan 2025 19:52:00 +0100
Subject: [PATCH] Fixes

---
 src/application/base/baseEntity.ts | 2 +-
 src/http/controllers/assets.ts     | 4 ++--
 src/models/loadedMap.ts            | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/application/base/baseEntity.ts b/src/application/base/baseEntity.ts
index a1d1817..24f651e 100644
--- a/src/application/base/baseEntity.ts
+++ b/src/application/base/baseEntity.ts
@@ -7,7 +7,7 @@ export abstract class BaseEntity {
   protected readonly logger = Logger.type(LoggerType.ENTITY)
 
   private getEntityManager(): EntityManager {
-    return Database.getEntityManager()
+    return Database.getORM().em.fork()
   }
 
   async save(): Promise<this> {
diff --git a/src/http/controllers/assets.ts b/src/http/controllers/assets.ts
index 0db73d0..211877c 100644
--- a/src/http/controllers/assets.ts
+++ b/src/http/controllers/assets.ts
@@ -75,9 +75,9 @@ export class AssetsController extends BaseController {
       return this.sendError(res, 'Sprite not found', 404)
     }
 
-    // await Database.getEntityManager().populate(sprite, ['spriteActions'])
+    await this.spriteRepository.getEntityManager().populate(sprite, ['spriteActions'])
 
-    const assets: AssetData[] = sprite.spriteActions.getItems().map((spriteAction) => ({
+    const assets: AssetData[] = sprite.getSpriteActions().map((spriteAction) => ({
       key: sprite.getId() + '-' + spriteAction.getAction(),
       data: '/assets/sprites/' + sprite.getId() + '/' + spriteAction.getAction() + '.png',
       group: spriteAction.getIsAnimated() ? 'sprite_animations' : 'sprites',
diff --git a/src/models/loadedMap.ts b/src/models/loadedMap.ts
index ff65e67..b652e0d 100644
--- a/src/models/loadedMap.ts
+++ b/src/models/loadedMap.ts
@@ -3,7 +3,7 @@ import MapCharacter from './mapCharacter'
 import { UUID } from '#application/types'
 import { Character } from '#entities/character'
 import { Map } from '#entities/map'
-import mapEventTileRepository from '#repositories/mapEventTileRepository'
+import MapEventTileRepository from '#repositories/mapEventTileRepository'
 
 class LoadedMap {
   private readonly map: Map
@@ -42,6 +42,7 @@ class LoadedMap {
   public async getGrid(): Promise<number[][]> {
     let grid: number[][] = Array.from({ length: this.map.height }, () => Array.from({ length: this.map.width }, () => 0))
 
+    const mapEventTileRepository = new MapEventTileRepository()
     const eventTiles = await mapEventTileRepository.getAll(this.map.id)
 
     // Set the grid values based on the event tiles, these are strings