From 1dd0e73c4a2f75dd291706a387223d5cc810e38c Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Sat, 4 Jan 2025 23:14:05 +0100 Subject: [PATCH] e --- src/events/gameMaster/assetManager/sprite/copy.ts | 7 ++++--- src/events/gameMaster/assetManager/sprite/delete.ts | 4 ++-- src/events/gameMaster/assetManager/tile/update.ts | 6 +----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/events/gameMaster/assetManager/sprite/copy.ts b/src/events/gameMaster/assetManager/sprite/copy.ts index 9ba4c48..d02cbd9 100644 --- a/src/events/gameMaster/assetManager/sprite/copy.ts +++ b/src/events/gameMaster/assetManager/sprite/copy.ts @@ -20,7 +20,8 @@ export default class SpriteCopyEvent extends BaseEvent { const sourceSprite = await spriteRepository.getById(payload.id) if (!sourceSprite) { - throw new Error('Source sprite not found') + this.logger.error('gm:sprite:copy error', 'Source sprite not found') + return callback(false) } // Populate source sprite with spriteActions @@ -29,10 +30,10 @@ export default class SpriteCopyEvent extends BaseEvent { const newSprite = new Sprite() await newSprite.setName(`${sourceSprite.getName()} (Copy)`).setSpriteActions(sourceSprite.getSpriteActions()).save() - callback(true) + return callback(true) } catch (error) { this.logger.error(`Error copying sprite:`, String(error)) - callback(false) + return callback(false) } } } diff --git a/src/events/gameMaster/assetManager/sprite/delete.ts b/src/events/gameMaster/assetManager/sprite/delete.ts index 7de40b5..fd8a964 100644 --- a/src/events/gameMaster/assetManager/sprite/delete.ts +++ b/src/events/gameMaster/assetManager/sprite/delete.ts @@ -24,10 +24,10 @@ export default class GMSpriteDeleteEvent extends BaseEvent { await (await spriteRepository.getById(data.id))?.delete() this.logger.info(`Sprite ${data.id} deleted.`) - callback(true) + return callback(true) } catch (error: any) { this.logger.error('gm:sprite:delete error', error.message) - callback(false) + return callback(false) } } diff --git a/src/events/gameMaster/assetManager/tile/update.ts b/src/events/gameMaster/assetManager/tile/update.ts index 6c27afc..51a40be 100644 --- a/src/events/gameMaster/assetManager/tile/update.ts +++ b/src/events/gameMaster/assetManager/tile/update.ts @@ -22,12 +22,8 @@ export default class TileUpdateEvent extends BaseEvent { const tile = await tileRepository.getById(data.id) if (!tile) return callback(false) - console.log(tile) - await tile.setName(data.name).setTags(data.tags).save() - - console.log(tile) - + return callback(true) } catch (error) { return callback(false)