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

Fixes

Browse Source
This commit is contained in:
Dennis Postma 2025-01-04 19:52:00 +01:00
parent 1f0db75806
commit 47ec425acf
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/application/base/baseEntity.ts
View File

@ -7,7 +7,7 @@ export abstract class BaseEntity {
protected readonly logger = Logger.type(LoggerType.ENTITY) protected readonly logger = Logger.type(LoggerType.ENTITY)
private getEntityManager(): EntityManager { private getEntityManager(): EntityManager {
return Database.getEntityManager() return Database.getORM().em.fork()
} }
async save(): Promise<this> { async save(): Promise<this> {

4
src/http/controllers/assets.ts
View File

@ -75,9 +75,9 @@ export class AssetsController extends BaseController {
return this.sendError(res, 'Sprite not found', 404) 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(), key: sprite.getId() + '-' + spriteAction.getAction(),
data: '/assets/sprites/' + sprite.getId() + '/' + spriteAction.getAction() + '.png', data: '/assets/sprites/' + sprite.getId() + '/' + spriteAction.getAction() + '.png',
group: spriteAction.getIsAnimated() ? 'sprite_animations' : 'sprites', group: spriteAction.getIsAnimated() ? 'sprite_animations' : 'sprites',

3
src/models/loadedMap.ts
View File

@ -3,7 +3,7 @@ import MapCharacter from './mapCharacter'
import { UUID } from '#application/types' import { UUID } from '#application/types'
import { Character } from '#entities/character' import { Character } from '#entities/character'
import { Map } from '#entities/map' import { Map } from '#entities/map'
import mapEventTileRepository from '#repositories/mapEventTileRepository' import MapEventTileRepository from '#repositories/mapEventTileRepository'
class LoadedMap { class LoadedMap {
private readonly map: Map private readonly map: Map
@ -42,6 +42,7 @@ class LoadedMap {
public async getGrid(): Promise<number[][]> { public async getGrid(): Promise<number[][]> {
let grid: number[][] = Array.from({ length: this.map.height }, () => Array.from({ length: this.map.width }, () => 0)) 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) const eventTiles = await mapEventTileRepository.getAll(this.map.id)
// Set the grid values based on the event tiles, these are strings // Set the grid values based on the event tiles, these are strings