The entity was jumping frames in flooded pet commands (come, guard)

Sphereserver · Oct 26, 2024 · 67de95e · 67de95e
1 parent f93d918
commit 67de95e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -3917,4 +3917,7 @@ Added: 'H' shortcut for variables to get the value as hexadecimal.
 
 26-10-2024, canerksk
 - Fixed: Memory OnTick link char if not, the skill will not fail.
-	If the memory owner is not present, skills do not fail when taking damage, but if the memory owner is alive, skills fail when taking damage.
+	If the memory owner is not present, skills do not fail when taking damage, but if the memory owner is alive, skills fail when taking damage.
+
+- Fixed: The entity was jumping frames in flooded pet commands (come, guard)
+
diff --git a/src/game/chars/CCharNPCPet.cpp b/src/game/chars/CCharNPCPet.cpp
@@ -173,14 +173,20 @@ bool CChar::NPC_OnHearPetCmd( lpctstr pszCmd, CChar *pSrc, bool fAllPets )
 			break;
 
         case PC_GUARD_ME:
-            m_Act_UID = pSrc->GetUID();
-            Skill_Start(NPCACT_GUARD_TARG);
+            if ((m_Act_UID != pSrc->GetUID()) || (Skill_GetActive() != NPCACT_GUARD_TARG)) // When you do all guard flood, the mount jumps one frame.
+            {
+                m_Act_UID = pSrc->GetUID();
+                Skill_Start(NPCACT_GUARD_TARG);
+            }
             break;
 
 		case PC_COME:
 		case PC_FOLLOW_ME:
-			m_Act_UID = pSrc->GetUID();
-			Skill_Start(NPCACT_FOLLOW_TARG);
+            if ((m_Act_UID != pSrc->GetUID()) || (Skill_GetActive() != NPCACT_FOLLOW_TARG)) // When you do all come flood, the mount jumps one frame.
+            {
+                m_Act_UID = pSrc->GetUID();
+                Skill_Start(NPCACT_FOLLOW_TARG);
+            }
 			break;
 
 		case PC_FOLLOW: