diff --git a/src/entities/base/sprite.ts b/src/entities/base/sprite.ts index 2ef9e54..91859ad 100644 --- a/src/entities/base/sprite.ts +++ b/src/entities/base/sprite.ts @@ -11,7 +11,7 @@ export class BaseSprite extends BaseEntity { @Property() name!: string - @OneToMany(() => SpriteAction, (action) => action.sprite) + @OneToMany({ mappedBy: 'sprite', orphanRemoval: true }) spriteActions = new Collection(this) @Property() diff --git a/src/events/gameMaster/assetManager/characterHair/create.ts b/src/events/gameMaster/assetManager/characterHair/create.ts index 6d186a8..66977a2 100644 --- a/src/events/gameMaster/assetManager/characterHair/create.ts +++ b/src/events/gameMaster/assetManager/characterHair/create.ts @@ -1,7 +1,7 @@ import { BaseEvent } from '@/application/base/baseEvent' -import { SocketEvent } from '@/application/enums' +import { CharacterGender, SocketEvent } from '@/application/enums' import { CharacterHair } from '@/entities/characterHair' -import SpriteRepository from "@/repositories/spriteRepository"; +import SpriteRepository from '@/repositories/spriteRepository' export default class CharacterHairCreateEvent extends BaseEvent { public listen(): void { @@ -22,7 +22,7 @@ export default class CharacterHairCreateEvent extends BaseEvent { } const newCharacterHair = new CharacterHair() - await newCharacterHair.setName('New hair').setSprite(firstSprite).save() + await newCharacterHair.setName('New hair').setGender(CharacterGender.MALE).setSprite(firstSprite).save() return callback(true) } catch (error) { diff --git a/src/events/gameMaster/assetManager/characterHair/update.ts b/src/events/gameMaster/assetManager/characterHair/update.ts index 8b03457..b2711d4 100644 --- a/src/events/gameMaster/assetManager/characterHair/update.ts +++ b/src/events/gameMaster/assetManager/characterHair/update.ts @@ -8,6 +8,7 @@ type Payload = { id: UUID name: string gender: CharacterGender + color: string isSelectable: boolean spriteId: UUID } @@ -29,7 +30,7 @@ export default class CharacterHairUpdateEvent extends BaseEvent { const characterHair = await characterHairRepository.getById(data.id) if (!characterHair) return callback(false) - await characterHair.setName(data.name).setGender(data.gender).setIsSelectable(data.isSelectable).setSprite(sprite).setUpdatedAt(new Date()).save() + await characterHair.setName(data.name).setGender(data.gender).setColor(data.color).setIsSelectable(data.isSelectable).setSprite(sprite).setUpdatedAt(new Date()).save() return callback(true) } catch (error) {