From 3b14179f65d3c0cd14604d8698d5af438cca25e3 Mon Sep 17 00:00:00 2001 From: megamage Date: Sat, 9 May 2009 21:59:01 -0500 Subject: *Allow dismiss possessed units. --HG-- branch : trunk --- src/game/PetHandler.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/game/PetHandler.cpp') diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 42d0093510b..bfbe8ca7df4 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -89,10 +89,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid switch(flag) { 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) { 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) if(pet->GetCharmerGUID() == GetPlayer()->GetGUID()) - { - if(GetPlayer()->m_seer != pet) - _player->StopCastingCharm(); - } + _player->StopCastingCharm(); else if(pet->GetOwnerGUID() == GetPlayer()->GetGUID()) { assert(pet->GetTypeId() == TYPEID_UNIT); -- cgit v1.2.3