forked from noxious/server
Fixes
This commit is contained in:
parent
1f0db75806
commit
47ec425acf
@ -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> {
|
||||
|
@ -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',
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user