core_merge_fix_due_header_split

This commit is contained in:
bash
2025-12-07 12:09:42 +01:00
parent 58c1c49610
commit 7b41eb5c90
@@ -670,22 +670,18 @@ public:
}; };
}; };
class at_thaddius_entrance : public AreaTriggerScript class at_thaddius_entrance : public OnlyOnceAreaTriggerScript
{ {
public: public:
at_thaddius_entrance() : AreaTriggerScript("at_thaddius_entrance") { } at_thaddius_entrance() : OnlyOnceAreaTriggerScript("at_thaddius_entrance") { }
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/) override bool _OnTrigger(Player* player, const AreaTrigger* /*trigger*/) override
{ {
InstanceScript* instance = player->GetInstanceScript(); if (InstanceScript* instance = player->GetInstanceScript())
if (!instance || instance->GetData(DATA_THADDIUS_INTRO) || instance->GetBossState(BOSS_THADDIUS) == DONE) if (instance->GetBossState(BOSS_THADDIUS) != DONE)
return true; if (Creature* thaddius = instance->GetCreature(DATA_THADDIUS_BOSS))
thaddius->AI()->Talk(SAY_GREET);
if (Creature* thaddius = instance->GetCreature(DATA_THADDIUS_BOSS)) return false;
thaddius->AI()->Talk(SAY_GREET);
instance->SetData(DATA_THADDIUS_INTRO, 1);
return true;
} }
}; };