diff --git a/src/spells.cpp b/src/spells.cpp index 03d5705b21..575b99fefa 100644 --- a/src/spells.cpp +++ b/src/spells.cpp @@ -850,7 +850,7 @@ bool InstantSpell::playerCastInstant(Player* player, std::string& param) } target = playerTarget; - if (!target || target->isDead()) { + if (!target || target->isRemoved() || target->isDead()) { if (!casterTargetOrDirection) { if (cooldown > 0) { Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLCOOLDOWN, @@ -884,7 +884,7 @@ bool InstantSpell::playerCastInstant(Player* player, std::string& param) } } else { target = player->getAttackedCreature(); - if (!target || target->isDead()) { + if (!target || target->isRemoved() || target->isDead()) { if (!casterTargetOrDirection) { player->sendCancelMessage(RETURNVALUE_YOUCANONLYUSEITONCREATURES); g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF);