From 047608e7de743e4f59ec2450a474c6a9c5234b68 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Tue, 11 Jun 2013 18:39:51 -0230 Subject: Core/SAI: Add check so npc will not send text to pet. Also updated isPet() to IsPet(). --- src/server/game/Spells/SpellEffects.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 fa82b6436d3..6312581b617 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -452,7 +452,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) // Shadow Bite else if (m_spellInfo->SpellFamilyFlags[1] & 0x400000) { - if (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->isPet()) + if (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->IsPet()) { if (Player* owner = m_caster->GetOwner()->ToPlayer()) { @@ -2992,7 +2992,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) Creature* creatureTarget = unitTarget->ToCreature(); - if (creatureTarget->isPet()) + if (creatureTarget->IsPet()) return; if (m_caster->getClass() != CLASS_HUNTER) @@ -4635,7 +4635,7 @@ void Spell::EffectDismissPet(SpellEffIndex effIndex) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || !unitTarget->isPet()) + if (!unitTarget || !unitTarget->IsPet()) return; Pet* pet = unitTarget->ToPet(); @@ -5878,7 +5878,7 @@ void Spell::EffectRenamePet(SpellEffIndex /*effIndex*/) return; if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || - !unitTarget->ToCreature()->isPet() || ((Pet*)unitTarget)->getPetType() != HUNTER_PET) + !unitTarget->ToCreature()->IsPet() || ((Pet*)unitTarget)->getPetType() != HUNTER_PET) return; unitTarget->SetByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED); -- cgit v1.2.3