diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 1e30ea9366..adf29b42a5 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -116,7 +116,7 @@ float UnitAI::DoGetSpellMaxRange(uint32 spellId, bool positive) return spellInfo ? spellInfo->GetMaxRange(positive) : 0; } -void UnitAI::DoCast(uint32 spellId) +SpellCastResult UnitAI::DoCast(uint32 spellId) { Unit* target = nullptr; @@ -162,21 +162,25 @@ void UnitAI::DoCast(uint32 spellId) } if (target) - me->CastSpell(target, spellId, false); + return me->CastSpell(target, spellId, false); + + return SPELL_FAILED_BAD_TARGETS; } -void UnitAI::DoCast(Unit* victim, uint32 spellId, CastSpellExtraArgs const& args) +SpellCastResult UnitAI::DoCast(Unit* victim, uint32 spellId, CastSpellExtraArgs const& args) { if (me->HasUnitState(UNIT_STATE_CASTING) && !(args.TriggerFlags & TRIGGERED_IGNORE_CAST_IN_PROGRESS)) - return; + return SPELL_FAILED_SPELL_IN_PROGRESS; - me->CastSpell(victim, spellId, args); + return me->CastSpell(victim, spellId, args); } -void UnitAI::DoCastVictim(uint32 spellId, CastSpellExtraArgs const& args) +SpellCastResult UnitAI::DoCastVictim(uint32 spellId, CastSpellExtraArgs const& args) { if (Unit* victim = me->GetVictim()) - DoCast(victim, spellId, args); + return DoCast(victim, spellId, args); + + return SPELL_FAILED_BAD_TARGETS; } #define UPDATE_TARGET(a) {if (AIInfo->targettarget=a;} diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index f8188cf588..6d43b5d1ee 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -308,11 +308,11 @@ class TC_GAME_API UnitAI void AttackStartCaster(Unit* victim, float dist); - void DoCast(uint32 spellId); - void DoCast(Unit* victim, uint32 spellId, CastSpellExtraArgs const& args = {}); - void DoCastSelf(uint32 spellId, CastSpellExtraArgs const& args = {}) { DoCast(me, spellId, args); } - void DoCastVictim(uint32 spellId, CastSpellExtraArgs const& args = {}); - void DoCastAOE(uint32 spellId, CastSpellExtraArgs const& args = {}) { DoCast(nullptr, spellId, args); } + SpellCastResult DoCast(uint32 spellId); + SpellCastResult DoCast(Unit* victim, uint32 spellId, CastSpellExtraArgs const& args = {}); + SpellCastResult DoCastSelf(uint32 spellId, CastSpellExtraArgs const& args = {}) { return DoCast(me, spellId, args); } + SpellCastResult DoCastVictim(uint32 spellId, CastSpellExtraArgs const& args = {}); + SpellCastResult DoCastAOE(uint32 spellId, CastSpellExtraArgs const& args = {}) { return DoCast(nullptr, spellId, args); } float DoGetSpellMaxRange(uint32 spellId, bool positive = false); void DoMeleeAttackIfReady(); diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index f8343d159e..b86517f444 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2894,13 +2894,13 @@ bool WorldObject::IsNeutralToAll() const return my_faction->IsNeutralToAll(); } -void WorldObject::CastSpell(SpellCastTargets const& targets, uint32 spellId, CastSpellExtraArgs const& args /*= { }*/) +SpellCastResult WorldObject::CastSpell(SpellCastTargets const& targets, uint32 spellId, CastSpellExtraArgs const& args /*= { }*/) { SpellInfo const* info = sSpellMgr->GetSpellInfo(spellId); if (!info) { TC_LOG_ERROR("entities.unit", "CastSpell: unknown spell %u by caster %s", spellId, GetGUID().ToString().c_str()); - return; + return SPELL_FAILED_SPELL_UNAVAILABLE; } Spell* spell = new Spell(this, info, args.TriggerFlags, args.OriginalCaster); @@ -2908,10 +2908,10 @@ void WorldObject::CastSpell(SpellCastTargets const& targets, uint32 spellId, Cas spell->SetSpellValue(pair.first, pair.second); spell->m_CastItem = args.CastItem; - spell->prepare(targets, args.TriggeringAura); + return spell->prepare(targets, args.TriggeringAura); } -void WorldObject::CastSpell(WorldObject* target, uint32 spellId, CastSpellExtraArgs const& args /*= { }*/) +SpellCastResult WorldObject::CastSpell(WorldObject* target, uint32 spellId, CastSpellExtraArgs const& args /*= { }*/) { SpellCastTargets targets; if (target) @@ -2923,17 +2923,17 @@ void WorldObject::CastSpell(WorldObject* target, uint32 spellId, CastSpellExtraA else { TC_LOG_ERROR("entities.unit", "CastSpell: Invalid target %s passed to spell cast by %s", target->GetGUID().ToString().c_str(), GetGUID().ToString().c_str()); - return; + return SPELL_FAILED_BAD_TARGETS; } } - CastSpell(targets, spellId, args); + return CastSpell(targets, spellId, args); } -void WorldObject::CastSpell(Position const& dest, uint32 spellId, CastSpellExtraArgs const& args /*= { }*/) +SpellCastResult WorldObject::CastSpell(Position const& dest, uint32 spellId, CastSpellExtraArgs const& args /*= { }*/) { SpellCastTargets targets; targets.SetDst(dest); - CastSpell(targets, spellId, args); + return CastSpell(targets, spellId, args); } // function based on function Unit::CanAttack from 13850 client diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index cda048eab6..1f375fc6af 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -465,9 +465,9 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation bool IsNeutralToAll() const; // CastSpell's third arg can be a variety of things - check out CastSpellExtraArgs' constructors! - void CastSpell(SpellCastTargets const& targets, uint32 spellId, CastSpellExtraArgs const& args = { }); - void CastSpell(WorldObject* target, uint32 spellId, CastSpellExtraArgs const& args = { }); - void CastSpell(Position const& dest, uint32 spellId, CastSpellExtraArgs const& args = { }); + SpellCastResult CastSpell(SpellCastTargets const& targets, uint32 spellId, CastSpellExtraArgs const& args = { }); + SpellCastResult CastSpell(WorldObject* target, uint32 spellId, CastSpellExtraArgs const& args = { }); + SpellCastResult CastSpell(Position const& dest, uint32 spellId, CastSpellExtraArgs const& args = { }); bool IsValidAttackTarget(WorldObject const* target, SpellInfo const* bySpell = nullptr) const; bool IsValidAssistTarget(WorldObject const* target, SpellInfo const* bySpell = nullptr) const; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 372c851690..d14fc6e9f4 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3138,7 +3138,7 @@ bool Spell::UpdateChanneledTargetList() return channelTargetEffectMask == 0; } -void Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggeredByAura) +SpellCastResult Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggeredByAura) { if (m_CastItem) { @@ -3191,7 +3191,7 @@ void Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggered { SendCastResult(SPELL_FAILED_SPELL_UNAVAILABLE); finish(false); - return; + return SPELL_FAILED_SPELL_UNAVAILABLE; } // Prevent casting at cast another spell (ServerSide check) @@ -3199,15 +3199,9 @@ void Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggered { SendCastResult(SPELL_FAILED_SPELL_IN_PROGRESS); finish(false); - return; + return SPELL_FAILED_SPELL_IN_PROGRESS; } - if (DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, m_caster)) - { - SendCastResult(SPELL_FAILED_SPELL_UNAVAILABLE); - finish(false); - return; - } LoadScripts(); // Fill cost data (do not use power for item casts) @@ -3246,7 +3240,7 @@ void Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggered SendCastResult(result); finish(false); - return; + return result; } // Prepare data for triggers @@ -3278,7 +3272,7 @@ void Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggered { SendCastResult(SPELL_FAILED_MOVING); finish(false); - return; + return SPELL_FAILED_MOVING; } } @@ -3332,6 +3326,8 @@ void Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggered if (!m_casttime && /*!m_spellInfo->StartRecoveryTime && */ GetCurrentContainer() == CURRENT_GENERIC_SPELL) cast(true); } + + return SPELL_CAST_OK; } void Spell::cancel(Spell* interruptingSpell /* = nullptr */) diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 983fc2b0c3..cf423e5c1f 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -440,7 +440,7 @@ class TC_GAME_API Spell GameObject* SearchSpellFocus(); - void prepare(SpellCastTargets const& targets, AuraEffect const* triggeredByAura = nullptr); + SpellCastResult prepare(SpellCastTargets const& targets, AuraEffect const* triggeredByAura = nullptr); void cancel(Spell* interruptingSpell = nullptr); void update(uint32 difftime); void cast(bool skipCheck = false);