aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-09 21:59:01 -0500
committermegamage <none@none>2009-05-09 21:59:01 -0500
commit3b14179f65d3c0cd14604d8698d5af438cca25e3 (patch)
treeb2092436b965ce2abd91d1708962f03d7ce59eac /src
parentecc953dd3d5bc948fea774d5a55c0b98f5795833 (diff)
*Allow dismiss possessed units.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/PetHandler.cpp9
1 files changed, 1 insertions, 8 deletions
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);