ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Scripts/Outland): store creatures as GUIDs instead of raw pointers (#25642)

Browse source
This commit is contained in:
sogladev 2026-04-28 23:18:30 +02:00 • committed by GitHub
parent 0e4e795ea9
commit 7958034c27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/server/scripts/Outland/zone_hellfire_peninsula.cpp
View file

@ -469,38 +469,51 @@ public:
struct go_beaconAI : public GameObjectAI
{
go_beaconAI(GameObject* gameObject) : GameObjectAI(gameObject) { }
explicit go_beaconAI(GameObject* gameObject) : GameObjectAI(gameObject) { }
std::list<Creature*> creatureList;
void OnStateChanged(uint32 state, Unit* /*unit*/) override
void OnStateChanged(uint32 state, Unit* /*unit*/) override
{
if (state == GO_ACTIVATED)
{
std::list<Creature*> creatureList;
_whelpGUIDs.clear();
me->GetCreaturesWithEntryInRange(creatureList, 40, NPC_STONESCHYE_WHELP);
for (Creature* whelp : creatureList)
{
for (Creature* whelp : creatureList)
{
if (whelp && whelp->IsAlive() && !whelp->IsInCombat() && whelp->GetMotionMaster()->GetCurrentMovementGeneratorType() != HOME_MOTION_TYPE)
whelp->GetMotionMaster()->MovePoint(0, me->GetNearPosition(4.0f, whelp->GetOrientation()));
}
if (!whelp)
continue;
_whelpGUIDs.push_back(whelp->GetGUID());
MotionMaster* motionMaster = whelp->GetMotionMaster();
if (whelp->IsAlive() && !whelp->IsInCombat() && motionMaster && motionMaster->GetCurrentMovementGeneratorType() != HOME_MOTION_TYPE)
motionMaster->MovePoint(0, me->GetNearPosition(4.0f, whelp->GetOrientation()));
}
}
else if (state == GO_JUST_DEACTIVATED)
{
for (ObjectGuid const& guid : _whelpGUIDs)
{
for (Creature* whelp : creatureList)
if (Creature* whelp = ObjectAccessor::GetCreature(*me, guid))
{
if (whelp && whelp->IsAlive() && !whelp->IsInCombat() && whelp->GetMotionMaster()->GetCurrentMovementGeneratorType() != HOME_MOTION_TYPE)
whelp->GetMotionMaster()->MoveTargetedHome();
MotionMaster* motionMaster = whelp->GetMotionMaster();
if (whelp->IsAlive() && !whelp->IsInCombat() && motionMaster && motionMaster->GetCurrentMovementGeneratorType() != HOME_MOTION_TYPE)
motionMaster->MoveTargetedHome();
}
}
_whelpGUIDs.clear();
}
else
{
creatureList.clear();
_whelpGUIDs.clear();
}
}
private:
GuidList _whelpGUIDs;
};
GameObjectAI* GetAI(GameObject* go) const override