diff options
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index a39763e7b3b..1e5b0ee2193 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2409,8 +2409,7 @@ void Spell::EffectUntrainTalents(SpellEffIndex /*effIndex*/) if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER) return; - if (ObjectGuid guid = m_caster->GetGUID()) // the trainer is the caster - unitTarget->ToPlayer()->SendTalentWipeConfirm(guid); + unitTarget->ToPlayer()->SendTalentWipeConfirm(m_caster->GetGUID()); } void Spell::EffectTeleUnitsFaceCaster(SpellEffIndex effIndex) @@ -2694,7 +2693,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (m_caster->GetPetGUID()) + if (!m_caster->GetPetGUID().IsEmpty()) return; if (!unitTarget) @@ -4199,8 +4198,8 @@ void Spell::EffectSummonObject(SpellEffIndex effIndex) uint32 go_id = m_spellInfo->Effects[effIndex].MiscValue; uint8 slot = m_spellInfo->Effects[effIndex].Effect - SPELL_EFFECT_SUMMON_OBJECT_SLOT1; - - if (ObjectGuid guid = m_caster->m_ObjectSlot[slot]) + ObjectGuid guid = m_caster->m_ObjectSlot[slot]; + if (!guid.IsEmpty()) { if (GameObject* obj = m_caster->GetMap()->GetGameObject(guid)) { |