Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-02-19 23:10:00 +08:00
12 changed files with 241 additions and 3 deletions

View File

@@ -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;
}

View File

@@ -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);