From d144724e2fd8a74a3e896751dc9c866b3932f815 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Oct 2014 19:23:32 +0200 Subject: Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64 (cherry picked from commit 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef) --- src/server/game/Spells/SpellEffects.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Spells/SpellEffects.cpp') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 9fc4471259d..96495d906b7 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2797,7 +2797,7 @@ void Spell::EffectTameCreature() return; Unit* unitCaster = GetUnitCasterForEffectHandlers(); - if (!unitCaster || unitCaster->GetPetGUID()) + if (!unitCaster || !unitCaster->GetPetGUID().IsEmpty()) return; if (!unitTarget) @@ -5121,7 +5121,7 @@ void Spell::EffectCreateTamedPet() 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 = effectInfo->MiscValue; -- cgit v1.2.3