Clean up pet stay functionality

cmangos · Aug 3, 2016 · 8837c45 · 8837c45
1 parent a05643b
commit 8837c45
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 34 deletions.
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
@@ -2096,3 +2096,23 @@ void Pet::SetModeFlags(PetModeFlags mode)
     data << uint32(m_petModeFlags);
     ((Player*)owner)->GetSession()->SendPacket(&data);
 }
+
+void Pet::SetStayPosition(bool stay)
+{
+    if (stay)
+    {
+        m_stayPosX = GetPositionX();
+        m_stayPosY = GetPositionY();
+        m_stayPosZ = GetPositionZ();
+        m_stayPosO = GetOrientation();
+    }
+    else
+    {
+        m_stayPosX = 0;
+        m_stayPosY = 0;
+        m_stayPosZ = 0;
+        m_stayPosO = 0;
+    }
+
+    m_stayPosSet = stay;
+}
diff --git a/src/game/Pet.h b/src/game/Pet.h
@@ -236,44 +236,23 @@ class MANGOS_DLL_SPEC Pet : public Creature
 
         bool m_retreating;
 
+        void SetIsRetreating(bool retreating = false) { m_retreating = retreating; }
         bool GetIsRetreating() { return m_retreating; }
-        void SetIsRetreating(bool retreating = false)
-        {
-            m_retreating = retreating;
-            ((Unit*)this)->InterruptNonMeleeSpells(false);
-        }
 
         bool m_stayPosSet;
         float m_stayPosX;
         float m_stayPosY;
         float m_stayPosZ;
         float m_stayPosO;
 
+        void SetStayPosition(bool stay = false);
         bool IsStayPosSet() { return m_stayPosSet; }
 
         float GetStayPosX() { return m_stayPosX; }
         float GetStayPosY() { return m_stayPosY; }
         float GetStayPosZ() { return m_stayPosZ; }
         float GetStayPosO() { return m_stayPosO; }
 
-        void SetStayPosition()
-        {
-            m_stayPosX = GetPositionX();
-            m_stayPosY = GetPositionY();
-            m_stayPosZ = GetPositionZ();
-            m_stayPosO = GetOrientation();
-            m_stayPosSet = true;
-        }
-
-        void ClearStayPosition()
-        {
-            m_stayPosSet = false;
-            m_stayPosX = 0;
-            m_stayPosY = 0;
-            m_stayPosZ = 0;
-            m_stayPosO = 0;
-        }
-
         PetSpellMap     m_spells;
         AutoSpellList   m_autospells;
 

diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
@@ -337,21 +337,30 @@ void PetAI::UpdateAI(const uint32 diff)
             {
                 if (Pet* pet = (Pet*)m_creature)
                 {
-                    //if stay command is already set but we dont have stay pos set then we need to establish current pos as stay position
+                    //if stay command is set but we dont have stay pos set then we need to establish current pos as stay position
                     if (!pet->IsStayPosSet())
-                        pet->SetStayPosition();
+                        pet->SetStayPosition(true);
 
                     float stayPosX = pet->GetStayPosX();
                     float stayPosY = pet->GetStayPosY();
                     float stayPosZ = pet->GetStayPosZ();
 
-                    if (!(m_creature->hasUnitState(UNIT_STAT_MOVING)
-                        || (m_creature->GetPositionX() == stayPosX
+                    if (m_creature->GetPositionX() == stayPosX
                         && m_creature->GetPositionY() == stayPosY
-                        && m_creature->GetPositionZ() == stayPosZ)))
-                            pet->GetMotionMaster()->MovePoint(0, stayPosX, stayPosY, stayPosZ, false);
-
-                    return;
+                        && m_creature->GetPositionZ() == stayPosZ)
+                    {
+                        float StayPosO = pet->GetStayPosO();
+
+                        if (m_creature->hasUnitState(UNIT_STAT_MOVING))
+                        {
+                            m_creature->GetMotionMaster()->Clear(false);
+                            m_creature->GetMotionMaster()->MoveIdle();
+                        }
+                        else if (m_creature->GetOrientation() != StayPosO)
+                            m_creature->SetOrientation(StayPosO);
+                    }
+                    else
+                        pet->GetMotionMaster()->MovePoint(0, stayPosX, stayPosY, stayPosZ, false);
                 }
             }
             else if (m_creature->hasUnitState(UNIT_STAT_FOLLOW))

diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
@@ -91,15 +91,15 @@ void WorldSession::HandlePetAction(WorldPacket& recv_data)
                     pet->AttackStop(true, true);
                     pet->GetMotionMaster()->Clear(false);
                     pet->GetMotionMaster()->MoveIdle();
-                    ((Pet*)pet)->SetStayPosition();
+                    ((Pet*)pet)->SetStayPosition(true);
                     ((Pet*)pet)->SetIsRetreating();
                     ((Pet*)pet)->SetSpellOpener();
                     charmInfo->SetCommandState(COMMAND_STAY);
                     break;
                 }
                 case COMMAND_FOLLOW:                        // spellid=1792  // FOLLOW
                 {
-                    ((Pet*)pet)->ClearStayPosition();
+                    ((Pet*)pet)->SetStayPosition();
                     pet->AttackStop(true, true);
                     pet->GetMotionMaster()->MoveFollow(_player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
                     ((Pet*)pet)->SetIsRetreating(true);
@@ -163,8 +163,8 @@ void WorldSession::HandlePetAction(WorldPacket& recv_data)
                         petC->ForcedDespawn();
                         return;
                     }
-                    ((Pet*)pet)->ClearStayPosition();
 
+                    ((Pet*)pet)->SetStayPosition();
                     break;
                 }
                 default: