josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix a crash when a player with a charmed target removes the pet.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-08 23:05:17 -05:00
parent 0c5efdf941
commit 031fe61a53
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+8 -3
View File
@@ -8012,7 +8012,7 @@ void Unit::SetGuardian(Guardian* guardian, bool apply)
if(AddUInt64Value(UNIT_FIELD_SUMMON, guardian->GetGUID())) if(AddUInt64Value(UNIT_FIELD_SUMMON, guardian->GetGUID()))
{ {
if(GetTypeId() == TYPEID_PLAYER) if(GetTypeId() == TYPEID_PLAYER && !GetCharmGUID())
{ {
if(guardian->isPet()) if(guardian->isPet())
((Player*)this)->PetSpellInitialize(); ((Player*)this)->PetSpellInitialize();
@@ -8047,12 +8047,17 @@ void Unit::SetGuardian(Guardian* guardian, bool apply)
//Check if there is another guardian //Check if there is another guardian
for(ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) for(ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
{ {
if(GetCharmGUID() == (*itr)->GetGUID())
continue;
assert((*itr)->GetOwnerGUID() == GetGUID()); assert((*itr)->GetOwnerGUID() == GetGUID());
assert((*itr)->GetTypeId() == TYPEID_UNIT);
if(AddUInt64Value(UNIT_FIELD_SUMMON, (*itr)->GetGUID())) if(AddUInt64Value(UNIT_FIELD_SUMMON, (*itr)->GetGUID()))
{ {
if(GetTypeId() == TYPEID_PLAYER) //show another pet bar if there is no charm bar
if(GetTypeId() == TYPEID_PLAYER && !GetCharmGUID())
{ {
if(guardian->isPet()) if(((Creature*)(*itr))->isPet())
((Player*)this)->PetSpellInitialize(); ((Player*)this)->PetSpellInitialize();
else else
((Player*)this)->CharmSpellInitialize(); ((Player*)this)->CharmSpellInitialize();