Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-03-31 12:44:21 +08:00
23 changed files with 150 additions and 124 deletions

View File

@@ -430,7 +430,7 @@ public:
UpdateData data;
WorldPacket pkt;
go->BuildValuesUpdateBlockForPlayer(&data, i->GetSource());
data.BuildPacket(&pkt);
data.BuildPacket(pkt);
i->GetSource()->GetSession()->SendPacket(&pkt);
}
}
@@ -473,7 +473,7 @@ public:
UpdateData data;
WorldPacket pkt;
go->BuildValuesUpdateBlockForPlayer(&data, i->GetSource());
data.BuildPacket(&pkt);
data.BuildPacket(pkt);
i->GetSource()->GetSession()->SendPacket(&pkt);
}
}

View File

@@ -60,6 +60,7 @@ struct boss_high_astromancer_solarian : public BossAI
{
boss_high_astromancer_solarian(Creature* creature) : BossAI(creature, DATA_ASTROMANCER)
{
callForHelpRange = 105.0f;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
@@ -118,7 +119,6 @@ struct boss_high_astromancer_solarian : public BossAI
{
Talk(SAY_AGGRO);
BossAI::JustEngagedWith(who);
me->CallForHelp(105.0f);
me->GetMotionMaster()->Clear();
scheduler.Schedule(3650ms, [this](TaskContext context)

View File

@@ -1009,7 +1009,6 @@ struct npc_thaladred : public ScriptedAI
scheduler.CancelAll();
me->SetReactState(REACT_PASSIVE);
_hasDied = false;
me->SetWalk(false);
}
void JustEngagedWith(Unit* /*who*/) override
@@ -1018,7 +1017,6 @@ struct npc_thaladred : public ScriptedAI
{
Talk(SAY_THALADRED_AGGRO);
}
me->SetWalk(true);
ScheduleTimedEvent(100ms, [&]
{
DoResetThreatList();

View File

@@ -41,6 +41,7 @@ struct boss_void_reaver : public BossAI
{
boss_void_reaver(Creature* creature) : BossAI(creature, DATA_REAVER)
{
callForHelpRange = 105.0f;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
@@ -82,7 +83,6 @@ struct boss_void_reaver : public BossAI
{
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
me->CallForHelp(105.0f);
scheduler.Schedule(10min, [this](TaskContext)
{

View File

@@ -438,7 +438,7 @@ class spell_pri_lightwell_renew : public AuraScript
UpdateData data;
WorldPacket packet;
caster->BuildValuesUpdateBlockForPlayer(&data, player);
data.BuildPacket(&packet);
data.BuildPacket(packet);
player->SendDirectMessage(&packet);
}
}