diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
| commit | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (patch) | |
| tree | e40c2f50a9b5b11620ee607103f0352521bdf54f /src/server/game/Spells/SpellEffects.cpp | |
| parent | 1bea52fd4649b6a1761aa157f9e74f01e19872e7 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index e3c06da3874..a39763e7b3b 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1219,7 +1219,7 @@ void Spell::EffectHeal(SpellEffIndex /*effIndex*/) if (unitTarget && unitTarget->IsAlive() && damage >= 0) { // Try to get original caster - Unit* caster = m_originalCasterGUID ? m_originalCaster : m_caster; + Unit* caster = !m_originalCasterGUID.IsEmpty() ? m_originalCaster : m_caster; // Skip if m_originalCaster not available if (!caster) @@ -5286,7 +5286,7 @@ void Spell::EffectCreateTamedPet(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || unitTarget->GetPetGUID() || unitTarget->getClass() != CLASS_HUNTER) + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || !unitTarget->GetPetGUID().IsEmpty() || unitTarget->getClass() != CLASS_HUNTER) return; uint32 creatureEntry = m_spellInfo->Effects[effIndex].MiscValue; |