Skip to content

Commit 9ac4892

Browse files
committed
build fix
1 parent 3161d49 commit 9ac4892

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/server/game/AI/ScriptedAI/ScriptedCreature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ void ScriptedAI::SetAggressiveStateAfter(Milliseconds timer, Creature* who/* = n
494494
{
495495
if (!who)
496496
who = me;
497-
who->m_Events.AddEvent(new Trinity::Helpers::Events::SetAggresiveStateEvent(who, startCombat, &summoner->GetGUID()), who->m_Events.CalculateTime(timer));
497+
who->m_Events.AddEvent(new Trinity::Helpers::Events::SetAggresiveStateEvent(who, startCombat, summoner->GetGUID()), who->m_Events.CalculateTime(timer));
498498
}
499499

500500
// BossAI - for instanced bosses

src/server/game/Miscellaneous/CommonHelpers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ bool Trinity::Helpers::Entity::IsPlayerRangedAttacker(Player const* who)
327327
}
328328
}
329329

330-
Trinity::Helpers::Events::SetAggresiveStateEvent::SetAggresiveStateEvent(Creature* owner, bool startCombat/* = true*/, ObjectGuid const* summonerGUID/* = nullptr*/) : _owner(owner), _startCombat(startCombat), _summonerGUID(summonerGUID)
330+
Trinity::Helpers::Events::SetAggresiveStateEvent::SetAggresiveStateEvent(Creature* owner, bool startCombat/* = true*/, ObjectGuid summonerGUID/* = ObjectGuid::Empty*/) : _owner(owner), _startCombat(startCombat), _summonerGUID(summonerGUID)
331331
{
332332
}
333333

@@ -342,7 +342,7 @@ bool Trinity::Helpers::Events::SetAggresiveStateEvent::Execute(uint64 /*time*/,
342342
_owner->AI()->AttackStart(currentVictim);
343343
}
344344
else if (_summonerGUID)
345-
if (Creature* summoner = ObjectAccessor::GetCreature(*_owner, *_summonerGUID))
345+
if (Creature* summoner = ObjectAccessor::GetCreature(*_owner, _summonerGUID))
346346
if (summoner->IsEngaged() && summoner->IsAIEnabled() && _owner->IsAIEnabled())
347347
if (Unit* target = summoner->AI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
348348
_owner->AI()->AttackStart(target);

src/server/game/Miscellaneous/CommonHelpers.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#define TRINITY_COMMONHELPERS_H
2020

2121
#include "Define.h"
22+
#include "ObjectGuid.h"
2223

2324
class Creature;
24-
class ObjectGuid;
2525
class Player;
2626

2727
namespace Trinity
@@ -40,14 +40,14 @@ namespace Trinity
4040
class SetAggresiveStateEvent : public BasicEvent
4141
{
4242
public:
43-
SetAggresiveStateEvent(Creature* owner, bool startCombat = true, ObjectGuid const* summonerGUID = nullptr);
43+
SetAggresiveStateEvent(Creature* owner, bool startCombat = true, ObjectGuid summonerGUID = ObjectGuid::Empty);
4444

4545
bool Execute(uint64 /*time*/, uint32 /*diff*/) override;
4646

4747
private:
4848
Creature* _owner;
4949
bool const _startCombat;
50-
ObjectGuid const* _summonerGUID;
50+
ObjectGuid const _summonerGUID;
5151
};
5252
}
5353
}

0 commit comments

Comments
 (0)