Fixed client setElementData not updating the server when enabling syn…

…chronization on an existing key with the same value
multitheftauto · Apr 22, 2018 · 7cf9dc4 · 7cf9dc4
1 parent 7b5bccb
commit 7cf9dc4
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 35 deletions.
diff --git a/Client/mods/deathmatch/logic/CClientEntity.cpp b/Client/mods/deathmatch/logic/CClientEntity.cpp
@@ -282,21 +282,23 @@ void CClientEntity::SetID(ElementID ID)
     }
 }
 
-CLuaArgument* CClientEntity::GetCustomData(const char* szName, bool bInheritData)
+CLuaArgument* CClientEntity::GetCustomData(const char* szName, bool bInheritData, bool* pbIsSynced)
 {
     assert(szName);
 
     // Grab it and return a pointer to the variable
     SCustomData* pData = m_pCustomData->Get(szName);
     if (pData)
     {
+        if (pbIsSynced)
+            *pbIsSynced = pData->bSynchronized;
         return &pData->Variable;
     }
 
     // If none, try returning parent's custom data
     if (bInheritData && m_pParent)
     {
-        return m_pParent->GetCustomData(szName, true);
+        return m_pParent->GetCustomData(szName, true, pbIsSynced);
     }
 
     // None available
@@ -458,7 +460,7 @@ bool CClientEntity::GetCustomDataBool(const char* szName, bool& bOut, bool bInhe
     return false;
 }
 
-void CClientEntity::SetCustomData(const char* szName, const CLuaArgument& Variable)
+void CClientEntity::SetCustomData(const char* szName, const CLuaArgument& Variable, bool bSynchronized)
 {
     assert(szName);
     if (strlen(szName) > MAX_CUSTOMDATA_NAME_LENGTH)
@@ -477,7 +479,7 @@ void CClientEntity::SetCustomData(const char* szName, const CLuaArgument& Variab
     }
 
     // Set the new data
-    m_pCustomData->Set(szName, Variable);
+    m_pCustomData->Set(szName, Variable, bSynchronized);
 
     // Trigger the onClientElementDataChange event on us
     CLuaArguments Arguments;

diff --git a/Client/mods/deathmatch/logic/CClientEntity.h b/Client/mods/deathmatch/logic/CClientEntity.h
@@ -194,12 +194,12 @@ class CClientEntity : public CClientEntityBase
     void      SetID(ElementID ID);
 
     CCustomData*  GetCustomDataPointer(void) { return m_pCustomData; }
-    CLuaArgument* GetCustomData(const char* szName, bool bInheritData);
+    CLuaArgument* GetCustomData(const char* szName, bool bInheritData, bool* pbIsSynced = nullptr);
     bool          GetCustomDataString(const char* szKey, SString& strOut, bool bInheritData);
     bool          GetCustomDataFloat(const char* szKey, float& fOut, bool bInheritData);
     bool          GetCustomDataInt(const char* szKey, int& iOut, bool bInheritData);
     bool          GetCustomDataBool(const char* szKey, bool& bOut, bool bInheritData);
-    void          SetCustomData(const char* szName, const CLuaArgument& Variable);
+    void          SetCustomData(const char* szName, const CLuaArgument& Variable, bool bSynchronized = true);
     void          DeleteCustomData(const char* szName);
 
     virtual bool GetMatrix(CMatrix& matrix) const;

diff --git a/Client/mods/deathmatch/logic/CCustomData.cpp b/Client/mods/deathmatch/logic/CCustomData.cpp
@@ -32,7 +32,7 @@ SCustomData* CCustomData::Get(const char* szName)
     return NULL;
 }
 
-void CCustomData::Set(const char* szName, const CLuaArgument& Variable)
+void CCustomData::Set(const char* szName, const CLuaArgument& Variable, bool bSynchronized)
 {
     assert(szName);
 
@@ -42,12 +42,14 @@ void CCustomData::Set(const char* szName, const CLuaArgument& Variable)
     {
         // Update existing
         pData->Variable = Variable;
+        pData->bSynchronized = bSynchronized;
     }
     else
     {
         // Add new
         SCustomData newData;
         newData.Variable = Variable;
+        newData.bSynchronized = bSynchronized;
         m_Data[szName] = newData;
     }
 }

diff --git a/Client/mods/deathmatch/logic/CCustomData.h b/Client/mods/deathmatch/logic/CCustomData.h
@@ -18,6 +18,7 @@
 struct SCustomData
 {
     CLuaArgument Variable;
+    bool         bSynchronized;
 };
 
 class CCustomData
@@ -26,7 +27,7 @@ class CCustomData
     void Copy(CCustomData* pCustomData);
 
     SCustomData* Get(const char* szName);
-    void         Set(const char* szName, const CLuaArgument& Variable);
+    void         Set(const char* szName, const CLuaArgument& Variable, bool bSynchronized = true);
 
     bool Delete(const char* szName);
 

diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -951,39 +951,28 @@ bool CStaticFunctionDefinitions::SetElementData(CClientEntity& Entity, const cha
     assert(szName);
     assert(strlen(szName) <= MAX_CUSTOMDATA_NAME_LENGTH);
 
-    CLuaArgument* pCurrentVariable = Entity.GetCustomData(szName, false);
-    if (!pCurrentVariable || Variable != *pCurrentVariable)
+    bool          bIsSynced;
+    CLuaArgument* pCurrentVariable = Entity.GetCustomData(szName, false, &bIsSynced);
+    if (!pCurrentVariable || Variable != *pCurrentVariable || bIsSynced != bSynchronize)
     {
         if (bSynchronize && !Entity.IsLocalEntity())
         {
-            // Allocate a bitstream
             NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream();
-            if (pBitStream)
-            {
-                // Write element ID, name length and the name. Also write the variable.
-                pBitStream->Write(Entity.GetID());
-                unsigned short usNameLength = static_cast<unsigned short>(strlen(szName));
-                pBitStream->WriteCompressed(usNameLength);
-                pBitStream->Write(szName, usNameLength);
-                Variable.WriteToBitStream(*pBitStream);
-
-                // Send the packet and deallocate
-                g_pNet->SendPacket(PACKET_ID_CUSTOM_DATA, pBitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
-                g_pNet->DeallocateNetBitStream(pBitStream);
-
-                // Set its custom data
-                Entity.SetCustomData(szName, Variable);
-
-                return true;
-            }
+            // Write element ID, name length and the name. Also write the variable.
+            pBitStream->Write(Entity.GetID());
+            unsigned short usNameLength = static_cast<unsigned short>(strlen(szName));
+            pBitStream->WriteCompressed(usNameLength);
+            pBitStream->Write(szName, usNameLength);
+            Variable.WriteToBitStream(*pBitStream);
+
+            // Send the packet and deallocate
+            g_pNet->SendPacket(PACKET_ID_CUSTOM_DATA, pBitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
+            g_pNet->DeallocateNetBitStream(pBitStream);
         }
-        else
-        {
-            // Set its custom data
-            Entity.SetCustomData(szName, Variable);
 
-            return true;
-        }
+        // Set its custom data
+        Entity.SetCustomData(szName, Variable, bSynchronize);
+        return true;
     }
 
     return false;