From 8787c00ca3eda49410cf9ecf2df53c2061628afd Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 5 Mar 2009 18:48:56 -0600
Subject: *Disable charmed/possessed creature AI. *Use general react states to
 replace charminfo react states.

--HG--
branch : trunk
---
 src/game/PetHandler.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/game/PetHandler.cpp')

diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 05c889b8cf9..19b05797618 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -120,7 +120,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
 
                     if(pet->GetTypeId() != TYPEID_PLAYER)
                     {
-                        if (((Creature*)pet)->AI())
+                        if (((Creature*)pet)->IsAIEnabled)
                             ((Creature*)pet)->AI()->AttackStart(TargetUnit);
 
                         //10% chance to play special pet attack talk, else growl
@@ -165,7 +165,8 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
                 case REACT_PASSIVE:                         //passive
                 case REACT_DEFENSIVE:                       //recovery
                 case REACT_AGGRESSIVE:                      //activete
-                    charmInfo->SetReactState( ReactStates(spellid) );
+                    if(pet->GetTypeId() == TYPEID_UNIT)
+                        ((Creature*)pet)->SetReactState( ReactStates(spellid) );
                     break;
             }
             break;
@@ -241,7 +242,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
                     if(pet->getVictim())
                         pet->AttackStop();
                     pet->GetMotionMaster()->Clear();
-                    if (((Creature*)pet)->AI())
+                    if (((Creature*)pet)->IsAIEnabled)
                         ((Creature*)pet)->AI()->AttackStart(unit_target);
                 }
 
-- 
cgit v1.2.3