From 87bb6d04f51e899f27ed1f346687aa922997334a Mon Sep 17 00:00:00 2001 From: Ovah Date: Fri, 13 Oct 2017 22:17:04 +0200 Subject: [PATCH] Core/AI: implemented AI hook for interrupting spells (#20610) --- src/server/game/AI/CreatureAI.h | 3 +++ src/server/game/Entities/Unit/Unit.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 527df43b06..a0f5284f0c 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -149,6 +149,9 @@ class TC_GAME_API CreatureAI : public UnitAI void OnCharmed(bool apply) override; + // Called when a spell cast gets interrupted + virtual void OnSpellCastInterrupt(SpellInfo const* /*spell*/) { } + // Called at reaching home after evade virtual void JustReachedHome() { } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index b6808b586c..e2de3b0ac3 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2993,6 +2993,9 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool wi if (spell->getState() != SPELL_STATE_FINISHED) spell->cancel(); + if (GetTypeId() == TYPEID_UNIT && IsAIEnabled) + ToCreature()->AI()->OnSpellCastInterrupt(spell->GetSpellInfo()); + m_currentSpells[spellType] = NULL; spell->SetReferencedFromCurrent(false); }