mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-23 21:56:22 +00:00
Merge branch 'master' into Playerbot
This commit is contained in:
@@ -128,7 +128,6 @@ uint32 ScriptMgr::GetDialogStatus(Player* player, GameObject* go)
|
||||
ASSERT(go);
|
||||
|
||||
auto tempScript = ScriptRegistry<GameObjectScript>::GetScriptById(go->GetScriptId());
|
||||
ClearGossipMenuFor(player);
|
||||
return tempScript ? tempScript->GetDialogStatus(player, go) : DIALOG_STATUS_SCRIPTED_NO_STATUS;
|
||||
}
|
||||
|
||||
|
||||
@@ -94,8 +94,6 @@ struct boss_leotheras_the_blind : public BossAI
|
||||
}
|
||||
|
||||
me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
|
||||
|
||||
DoResetThreatList();
|
||||
me->ClearTarget();
|
||||
me->SendMeleeAttackStop();
|
||||
scheduler.CancelGroup(GROUP_DEMON);
|
||||
@@ -112,6 +110,7 @@ struct boss_leotheras_the_blind : public BossAI
|
||||
DoCastSelf(SPELL_SUMMON_SHADOW_OF_LEOTHERAS);
|
||||
}).Schedule(6s, [this](TaskContext)
|
||||
{
|
||||
DoResetThreatList();
|
||||
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
|
||||
Reference in New Issue
Block a user