From 25fd5c18e8857d072bbc4aa423e65109bf371546 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 11 Feb 2021 10:13:35 +0200 Subject: [PATCH] Fixed casting broken by refactoring --- app/imports/api/creature/actions/castSpellWithSlot.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/imports/api/creature/actions/castSpellWithSlot.js b/app/imports/api/creature/actions/castSpellWithSlot.js index 3a80ff5f..d0da6a42 100644 --- a/app/imports/api/creature/actions/castSpellWithSlot.js +++ b/app/imports/api/creature/actions/castSpellWithSlot.js @@ -1,11 +1,13 @@ import SimpleSchema from 'simpl-schema'; import { ValidatedMethod } from 'meteor/mdg:validated-method'; import { RateLimiterMixin } from 'ddp-rate-limiter-mixin'; -import CreatureProperties, { getCreature } from '/imports/api/creature/creatureProperties/CreatureProperties.js'; +import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js'; +import Creatures from '/imports/api/creature/Creatures.js'; import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js'; import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js'; import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js'; import { doActionWork } from '/imports/api/creature/actions/doAction.js'; +import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js'; const castSpellWithSlot = new ValidatedMethod({ name: 'creatureProperties.castSpellWithSlot', @@ -30,11 +32,11 @@ const castSpellWithSlot = new ValidatedMethod({ run({spellId, slotId, targetId}) { let spell = CreatureProperties.findOne(spellId); // Check permissions - let creature = getCreature(spell); + let creature = getRootCreatureAncestor(spell); assertEditPermission(creature, this.userId); let target = undefined; if (targetId) { - target = getCreature(targetId); + target = Creatures.findOne(targetId); assertEditPermission(target, this.userId); } let slotLevel = spell.level || 0;