sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/ZulAman): text with symbol and improved frog movement (#21206)

Browse Source 
Co-authored-by: sudlud <sudlud@users.noreply.github.com>
Co-authored-by: Jelle Meeus <sogladev@gmail.com>
This commit is contained in:
Grimgravy
2025-03-12 07:15:59 -03:00
committed by GitHub
parent 5a89348d73
commit 502730d89e
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+11 -4
View File
@@ -86,6 +86,12 @@ struct npc_forest_frog : public ScriptedAI
if (eventTimer) if (eventTimer)
{ {
Player* player = ObjectAccessor::GetPlayer(me->GetMap(), PlayerGUID); Player* player = ObjectAccessor::GetPlayer(me->GetMap(), PlayerGUID);
if (!player)
{
events.CancelEvent(eventTimer);
eventTimer = 0;
return;
}
switch (events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 1: case 1:
@@ -141,7 +147,7 @@ struct npc_forest_frog : public ScriptedAI
if (me->GetEntry() == NPC_ADARRAH) if (me->GetEntry() == NPC_ADARRAH)
Talk(SAY_CHEST_TALK + 1, player); Talk(SAY_CHEST_TALK + 1, player);
else else
Talk(SAY_CHEST_TALK); Talk(SAY_CHEST_TALK, player);
eventTimer = 4; eventTimer = 4;
if (me->GetEntry() == NPC_GUNTER || me->GetEntry() == NPC_KYREN) if (me->GetEntry() == NPC_GUNTER || me->GetEntry() == NPC_KYREN)
@@ -155,7 +161,7 @@ struct npc_forest_frog : public ScriptedAI
if (me->GetEntry() == NPC_ADARRAH) if (me->GetEntry() == NPC_ADARRAH)
Talk(SAY_GOODBYE + 1, player); Talk(SAY_GOODBYE + 1, player);
else else
Talk(SAY_GOODBYE); Talk(SAY_GOODBYE, player);
eventTimer = 5; eventTimer = 5;
events.ScheduleEvent(eventTimer, 2000); events.ScheduleEvent(eventTimer, 2000);
@@ -201,6 +207,9 @@ struct npc_forest_frog : public ScriptedAI
events.ScheduleEvent(eventTimer, 3000); events.ScheduleEvent(eventTimer, 3000);
me->UpdateEntry(cEntry); me->UpdateEntry(cEntry);
if (Player* player = ObjectAccessor::GetPlayer(me->GetMap(), PlayerGUID))
me->SetFacingToObject(player);
} }
void SpellHit(Unit* caster, SpellInfo const* spell) override void SpellHit(Unit* caster, SpellInfo const* spell) override
@@ -208,7 +217,6 @@ struct npc_forest_frog : public ScriptedAI
if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->IsPlayer() && me->GetEntry() == NPC_FOREST_FROG) if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->IsPlayer() && me->GetEntry() == NPC_FOREST_FROG)
{ {
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
me->SetFacingToObject(caster);
PlayerGUID = caster->GetGUID(); PlayerGUID = caster->GetGUID();
if (roll_chance_i(2)) if (roll_chance_i(2))
@@ -223,7 +231,6 @@ struct npc_forest_frog : public ScriptedAI
private: private:
InstanceScript* instance; InstanceScript* instance;
EventMap events;
uint8 eventTimer; uint8 eventTimer;
ObjectGuid PlayerGUID; ObjectGuid PlayerGUID;
}; };