aboutsummaryrefslogtreecommitdiff
path: root/src/game/PetHandler.cpp
diff options
context:
space:
mode:
authorgvcoman <none@none>2008-11-08 23:32:15 -0600
committergvcoman <none@none>2008-11-08 23:32:15 -0600
commitc014d6667c71f1d618fe195b21e2dd86e5407825 (patch)
tree1fb039873fd6206d2829adc9e9b31e4a679d76a9 /src/game/PetHandler.cpp
parent35a284df7ea832a3c4beaa873af39441b67cb581 (diff)
[svn] * Disabled the move and stay commands while pet is possessed
* Make pet come back to its owner after possession ends if it's not currently in combat * Allow the possessed unit to properly change attack targets * Also remove charm effects from charmed target on owner aura cancel --HG-- branch : trunk
Diffstat (limited to 'src/game/PetHandler.cpp')
-rw-r--r--src/game/PetHandler.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index ac198c0be67..e308908dd50 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -78,6 +78,10 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
switch(flag)
{
case ACT_COMMAND: //0x0700
+ // Possessed pets are only able to attack
+ if (pet->isPossessed() && spellid != COMMAND_ATTACK)
+ return;
+
switch(spellid)
{
case COMMAND_STAY: //flat=1792 //STAY