*Fix a crash caused by possess pet. Thanks to nanouniko

--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-27 11:32:46 -05:00
parent 71860b5024
commit 56bdb0fc6b
3 changed files with 15 additions and 18 deletions
+8 -4
View File
@@ -6735,11 +6735,15 @@ void AuraEffect::HandleModPossessPet(bool apply, bool Real, bool /*changeAmount*
if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
return;
if(((Player*)caster)->GetPet() != m_target)
return;
//seems it may happen that when removing it is no longer owner's pet
//if(((Player*)caster)->GetPet() != m_target)
// return;
if(apply)
{
if(((Player*)caster)->GetPet() != m_target)
return;
m_target->SetCharmedBy(caster, CHARM_TYPE_POSSESS);
}
else
@@ -6751,8 +6755,8 @@ void AuraEffect::HandleModPossessPet(bool apply, bool Real, bool /*changeAmount*
if(!m_target->getVictim())
{
m_target->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, m_target->GetFollowAngle());
if(m_target->GetCharmInfo())
m_target->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
//if(m_target->GetCharmInfo())
// m_target->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
}
}
}
+4 -1
View File
@@ -526,8 +526,11 @@ void WorldSession::HandleSpellClick( WorldPacket & recv_data )
// TODO: Unit::SetCharmedBy: 28782 is not in world but 0 is trying to charm it! -> crash
if(!unit->IsInWorld())
{
sLog.outCrash("Spell click target %u is not in world!", unit->GetEntry());
assert(false);
return;
}
SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(unit->GetEntry());
for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)