diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 21:09:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-09-28 23:29:04 +0200 |
| commit | 7eab6a791ae1c039de67a80ff8bd125bf69f7ba4 (patch) | |
| tree | 33fdc30d2a282d93ff0fbd1612228c394adfa6a0 /src/server/scripts/EasternKingdoms | |
| parent | 75f036976410811d3c2629ddcddd279beb2dafb8 (diff) | |
Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64
(cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9)
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index dfc591f591d..df0eb7e6686 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -149,8 +149,8 @@ struct boss_vaelastrasz : public BossAI break; case EVENT_SPEECH_4: me->SetFaction(FACTION_DRAGONFLIGHT_BLACK); - if (PlayerGUID && ObjectAccessor::GetUnit(*me, PlayerGUID)) - AttackStart(ObjectAccessor::GetUnit(*me, PlayerGUID));; + if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID)) + AttackStart(player); break; } } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index f641abf1763..54341e97794 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -426,7 +426,7 @@ class npc_akilzon_eagle : public CreatureScript void MovementInform(uint32, uint32) override { arrived = true; - if (TargetGUID) + if (!TargetGUID.IsEmpty()) { if (Unit* target = ObjectAccessor::GetUnit(*me, TargetGUID)) DoCast(target, SPELL_EAGLE_SWOOP, true); |