Pet Affinity Fix (maybe)

[demonstar55]

Originally Posted by cavedude

The one thing I did change was !Charmed() should be !caster->GetPet()->Charmed(), substituting caster with members[z] where necessary. Haven't had time to test yet, though. I also added it to a couple of missed lines.

Alright that's what I was going to do, some how I missed the lines in spells.cpp my first time, but yeah that's what I was going to try when I went home for spring break

[demonstar55]

even though I'm sure CD found them all, I'll just post everything fixed:

zones/groups.cpp

lines 594-597

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity))
				caster->SpellOnTarget(spell_id, caster->GetPet());
#endif

change to

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity) && !caster->GetPet()->Charmed())
				caster->SpellOnTarget(spell_id, caster->GetPet());
#endif

lines 604 - 607

#ifdef GROUP_BUFF_PETS
				if(members[z]->GetPet() && members[z]->GetAA(aaPetAffinity))
					caster->SpellOnTarget(spell_id, members[z]->GetPet());
#endif

change to

#ifdef GROUP_BUFF_PETS
				if(members[z]->GetPet() && members[z]->GetAA(aaPetAffinity) && !members[z]->GetPet()->Charmed())
					caster->SpellOnTarget(spell_id, members[z]->GetPet());
#endif

lines 633-636

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity))
				caster->BardPulse(spell_id, caster->GetPet());
#endif

change to

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity) && !caster->GetPet()->Charmed())
				caster->BardPulse(spell_id, caster->GetPet());
#endif

well I think you get the idea, but here is the rest of the line numbers

in zones/groups.cpp on line 644

in zones/raids.cpp on lines 413, 424, 592, 603

in zones/spells.cpp on lines 1561 and 1569

the rest in groups and raids are the same (it's the same two statements), for spells it's a little different, for line 1561 change

if (GetPet() && GetAA(aaPetAffinity))

to

if (GetPet() && GetAA(aaPetAffinity) && !GetPet()->Charmed())

and on 1569

if (spell_target->GetPet() && GetAA(aaPetAffinity))

to

if (spell_target->GetPet() && GetAA(aaPetAffinity) && !spell_target->GetPet()->Charmed())

these should be all correct, but I don't have a means to test them

[cavedude]

I played with this last night and it's not working. To be truthful, I'm stumped. We're checking if the player has a pet, making sure the pet isn't charmed, and checking to make sure they have the AA. If they all check out we cast the spell on the pet... But charmed pets are still getting hit by buffs/songs. I can find no other place in the code where this AA is specified.

[demonstar55]

Originally Posted by cavedude

I played with this last night and it's not working. To be truthful, I'm stumped. We're checking if the player has a pet, making sure the pet isn't charmed, and checking to make sure they have the AA. If they all check out we cast the spell on the pet... But charmed pets are still getting hit by buffs/songs. I can find no other place in the code where this AA is specified.

!caster->GetPet()->Charmed() must not be check if the pet is charmed :P, I guess I'd have to look into each function better, but I'd assume Charmed() would check if current thing is charmed (the caster's pet in this case), so I guess when I get home and can compile I'll mess around with this some more, unless someone beats me to it :P

[cavedude]

Charmed() by itself is a null pointer and will create a zone crash. There is no current entity, that's why caster-> is specified. The server will basically say is what not charmed, and then crash. But, caster->GetPet()->Charmed() is the correct code to find it the caster's pet has a charm spell on them. I've used it in the past, and it wouldn't compile if it wasn't valid.

[cavedude]

I'll fiddle with GetPetType and a couple of other things.

[demonstar55]

Originally Posted by cavedude

I'll fiddle with GetPetType and a couple of other things.

try caster->GetPetType != petCharmed