*Allow dismiss possessed units.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-09 21:59:01 -05:00
parent ecc953dd3d
commit 3b14179f65
+1 -8
View File
@@ -89,10 +89,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
switch(flag) switch(flag)
{ {
case ACT_COMMAND: //0x0700 case ACT_COMMAND: //0x0700
// Possessed or shared vision pets are only able to attack
if ((pet->isPossessed() || pet->HasAuraType(SPELL_AURA_BIND_SIGHT)) && spellid != COMMAND_ATTACK)
return;
switch(spellid) switch(spellid)
{ {
case COMMAND_STAY: //flat=1792 //STAY case COMMAND_STAY: //flat=1792 //STAY
@@ -162,10 +158,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
} }
case COMMAND_ABANDON: // abandon (hunter pet) or dismiss (summoned pet) case COMMAND_ABANDON: // abandon (hunter pet) or dismiss (summoned pet)
if(pet->GetCharmerGUID() == GetPlayer()->GetGUID()) if(pet->GetCharmerGUID() == GetPlayer()->GetGUID())
{ _player->StopCastingCharm();
if(GetPlayer()->m_seer != pet)
_player->StopCastingCharm();
}
else if(pet->GetOwnerGUID() == GetPlayer()->GetGUID()) else if(pet->GetOwnerGUID() == GetPlayer()->GetGUID())
{ {
assert(pet->GetTypeId() == TYPEID_UNIT); assert(pet->GetTypeId() == TYPEID_UNIT);