Fix object rotation desync after moveObject animation completes (#549) (#4445)

Add NotifyMovementComplete method and improve GetRotation logic

Author: MohabCodeX

Server/mods/deathmatch/logic/CObject.cpp

@@ -13,6 +13,9 @@
 #include "CObject.h"
 #include "CLogger.h"
 #include "Utils.h"
+#include "CGame.h"
+#include "packets/CElementRPCPacket.h"
+#include <net/rpc_enums.h>
 
 extern CGame* g_pGame;
 
@@ -271,12 +274,12 @@ void CObject::SetPosition(const CVector& vecPosition)
 
 void CObject::GetRotation(CVector& vecRotation)
 {
-    vecRotation = m_vecRotation;
-
     // Are we attached to something?
     if (m_pAttachedTo)
+    {
+        vecRotation = m_vecRotation;
         GetAttachedRotation(vecRotation);
-
+    }
     // Are we moving?
     else if (IsMoving())
     {
@@ -289,6 +292,11 @@ void CObject::GetRotation(CVector& vecRotation)
         }
         vecRotation = m_vecRotation;
     }
+    else
+    {
+        // Not moving and not attached, return stored rotation
+        vecRotation = m_vecRotation;
+    }
 }
 
 void CObject::SetRotation(const CVector& vecRotation)
@@ -352,18 +360,18 @@ void CObject::Move(const CPositionRotationAnimation& a_rMoveAnimation)
 
 void CObject::StopMoving()
 {
-    // Were we moving in the first place
-    if (m_pMoveAnimation != NULL)
+    if (m_pMoveAnimation != nullptr)
     {
         SPositionRotation positionRotation;
         m_pMoveAnimation->GetValue(positionRotation);
         m_vecPosition = positionRotation.m_vecPosition;
         m_vecRotation = positionRotation.m_vecRotation;
 
         delete m_pMoveAnimation;
-        m_pMoveAnimation = NULL;
+        m_pMoveAnimation = nullptr;
 
         UpdateSpatialData();
+        NotifyMovementComplete();
     }
 }
 
@@ -375,7 +383,7 @@ const CPositionRotationAnimation* CObject::GetMoveAnimation()
     }
     else
     {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -427,7 +435,7 @@ bool CObject::SetLowLodObject(CObject* pNewLowLodObject)
 
         // Clear there and here
         ListRemove(m_pLowLodObject->m_HighLodObjectList, this);
-        m_pLowLodObject = NULL;
+        m_pLowLodObject = nullptr;
         return true;
     }
     else
@@ -437,7 +445,7 @@ bool CObject::SetLowLodObject(CObject* pNewLowLodObject)
             return false;
 
         // Remove any previous link
-        SetLowLodObject(NULL);
+        SetLowLodObject(nullptr);
 
         // Make new link
         m_pLowLodObject = pNewLowLodObject;
@@ -449,6 +457,18 @@ bool CObject::SetLowLodObject(CObject* pNewLowLodObject)
 CObject* CObject::GetLowLodObject()
 {
     if (m_bIsLowLod)
-        return NULL;
+        return nullptr;
     return m_pLowLodObject;
 }
+
+void CObject::NotifyMovementComplete()
+{
+    CBitStream BitStream;
+    BitStream.pBitStream->Write(m_vecPosition.fX);
+    BitStream.pBitStream->Write(m_vecPosition.fY);
+    BitStream.pBitStream->Write(m_vecPosition.fZ);
+    BitStream.pBitStream->Write(m_vecRotation.fX);
+    BitStream.pBitStream->Write(m_vecRotation.fY);
+    BitStream.pBitStream->Write(m_vecRotation.fZ);
+    g_pGame->GetPlayerManager()->BroadcastOnlyJoined(CElementRPCPacket(this, STOP_OBJECT, *BitStream.pBitStream));
+}

Server/mods/deathmatch/logic/CObject.h

@@ -101,6 +101,8 @@ class CObject : public CElement
     bool            m_bVisibleInAllDimensions = false;
     bool            m_bRespawnable;
 
+    void NotifyMovementComplete();
+
 protected:
     bool m_bCollisionsEnabled;