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/game/Instances/InstanceScript.cpp | |
| 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/game/Instances/InstanceScript.cpp')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 1435960d6e4..745e67c586c 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -638,7 +638,8 @@ void InstanceScript::DoRemoveAurasDueToSpellOnPlayer(Player* player, uint32 spel for (uint8 itr2 = 0; itr2 < MAX_SUMMON_SLOT; ++itr2) { - if (ObjectGuid summonGUID = player->m_SummonSlot[itr2]) + ObjectGuid summonGUID = player->m_SummonSlot[itr2]; + if (!summonGUID.IsEmpty()) if (Creature* summon = instance->GetCreature(summonGUID)) summon->RemoveAurasDueToSpell(spell); } @@ -673,7 +674,8 @@ void InstanceScript::DoCastSpellOnPlayer(Player* player, uint32 spell, bool incl for (uint8 itr2 = 0; itr2 < MAX_SUMMON_SLOT; ++itr2) { - if (ObjectGuid summonGUID = player->m_SummonSlot[itr2]) + ObjectGuid summonGUID = player->m_SummonSlot[itr2]; + if (!summonGUID.IsEmpty()) if (Creature* summon = instance->GetCreature(summonGUID)) summon->CastSpell(player, spell, true); } |