Skip to content

Commit cf931ea

Browse files
committed
UnitAI: Fix Wandering Eye of Kilrogg
1 parent 4fd9221 commit cf931ea

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

sql/scriptdev2/spell.sql

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ INSERT INTO spell_scripts(Id, ScriptName) VALUES
6464
(20038,'spell_explosion_razorgore'),
6565
(21651,'spell_opening_capping'),
6666
(22858,'spell_retaliation_creature'),
67+
(22876,'spell_summon_netherwalker'),
6768
(23134,'spell_goblin_bomb'),
6869
(23226,'spell_ritual_candle_aura'),
6970
(24228,'spell_arlokk_vanish'),

src/game/AI/BaseAI/UnitAI.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,6 @@ void UnitAI::TimedFleeingEnded()
829829

830830
bool UnitAI::DoFlee(uint32 duration)
831831
{
832-
Unit* victim = m_unit->GetVictim();
833-
if (!victim)
834-
return false;
835-
836832
if (!duration)
837833
duration = sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_FLEE_DELAY);
838834

src/game/AI/ScriptDevAI/scripts/kalimdor/dire_maul/dire_maul.cpp

+13
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,18 @@ struct RitualCandleAura : public SpellScript
308308
}
309309
};
310310

311+
// 22876 - Summon Netherwalker
312+
struct SummonNetherWalker : public SpellScript
313+
{
314+
void OnSuccessfulFinish(Spell* spell) const override
315+
{
316+
Creature* caster = static_cast<Creature*>(spell->GetCaster());
317+
if (!caster || !caster->IsAlive() || !caster->IsCreature())
318+
return;
319+
caster->ForcedDespawn();
320+
}
321+
};
322+
311323
void AddSC_dire_maul()
312324
{
313325
Script* pNewScript = new Script;
@@ -326,4 +338,5 @@ void AddSC_dire_maul()
326338
pNewScript->RegisterSelf();
327339

328340
RegisterSpellScript<RitualCandleAura>("spell_ritual_candle_aura");
341+
RegisterSpellScript<SummonNetherWalker>("spell_summon_netherwalker");
329342
}

0 commit comments

Comments
 (0)