Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripted/ZG: Ohgan is no longer on a spiritless diet and kills Chained Spirits again

Browse Source
This commit is contained in:
Ovahlord
2021-01-18 09:14:58 +01:00
parent c0d6b4a04c
commit ef4e3c675b
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp
View File

@@ -107,14 +107,11 @@ enum SummonGroups
struct boss_bloodlord_mandokir : public BossAI
{
boss_bloodlord_mandokir(Creature* creature) : BossAI(creature, DATA_BLOODLORD_MANDOKIR) { }
boss_bloodlord_mandokir(Creature* creature) : BossAI(creature, DATA_BLOODLORD_MANDOKIR), _ohganotSoFast(true), _reanimateOhganCooldown(false) { }
void Reset() override
void JustAppeared() override
{
_Reset();
me->SummonCreatureGroup(SUMMON_GROUP_CHAINED_SPIRIT);
_ohganotSoFast = true;
_reanimateOhganCooldown = false;
}
void JustEngagedWith(Unit* who) override
@@ -316,14 +313,8 @@ private:
struct npc_mandokir_ohgan : public ScriptedAI
{
npc_mandokir_ohgan(Creature* creature) : ScriptedAI(creature), _instance(me->GetInstanceScript())
npc_mandokir_ohgan(Creature* creature) : ScriptedAI(creature), _instance(me->GetInstanceScript()), _allowPlayerCombat(false)
{
Initialize();
}
void Initialize()
{
_allowPlayerCombat = false;
me->SetReactState(REACT_PASSIVE);
}
@@ -596,8 +587,18 @@ class spell_mandokir_ohgan_orders : public SpellScript
void HandleScript(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
if (Unit* target = GetHitUnit())
caster->CastSpell(target, uint32(GetEffectValue()), true);
if (!caster)
return;
Unit* target = GetHitUnit();
caster->CastSpell(target, uint32(GetEffectValue()), true);
caster->GetThreatManager().AddThreat(target, GetSpellInfo()->Effects[EFFECT_1].BasePoints, nullptr, true, true);
caster->GetThreatManager().FixateTarget(GetHitUnit());
if (Creature* creature = caster->ToCreature())
{
creature->SetReactState(REACT_AGGRESSIVE);
creature->EngageWithTarget(GetHitUnit());
}
}
void Register() override
@@ -617,10 +618,6 @@ class spell_mandokir_ohgan_orders_trigger : public SpellScript
// Enabling melee attacks to kill the spirits
caster->ClearUnitState(UNIT_STATE_CASTING);
if (Creature* creature = caster->ToCreature())
if (creature->IsAIEnabled)
creature->AI()->AttackStart(GetHitUnit());
}
void Register() override