Make trigger triggerLatentClientEvent return eventId instead of true

Author: Xenius97

Server/mods/deathmatch/logic/CGame.cpp

@@ -4697,7 +4697,10 @@ bool CGame::SendPacket(unsigned char ucPacketID, const NetServerPlayerID& player
         return g_pNetServer->SendPacket(ucPacketID, playerID, pBitStream, bBroadcast, packetPriority, packetReliability, packetOrdering);
     }
     else
-        GetLatentTransferManager()->AddSend(playerID, pBitStream->Version(), m_iLatentSendsBandwidth, m_pLatentSendsLuaMain, m_usLatentSendsResourceNetId);
+    {
+        SSendHandle handle = GetLatentTransferManager()->AddSend(playerID, pBitStream->Version(), m_iLatentSendsBandwidth, m_pLatentSendsLuaMain, m_usLatentSendsResourceNetId);
+        m_LastSentHandle = handle;
+    }
     return true;
 }
 

Server/mods/deathmatch/logic/CGame.h

@@ -465,6 +465,7 @@ class CGame
                     NetServerPacketPriority packetPriority, NetServerPacketReliability packetReliability,
                     ePacketOrdering packetOrdering = PACKET_ORDERING_DEFAULT);
     void SendPacketBatchEnd();
+    uint GetLastSentHandle() const { return m_LastSentHandle; }
 
     bool IsBulletSyncActive();
     void SendSyncSettings(CPlayer* pPlayer = NULL);
@@ -671,6 +672,7 @@ class CGame
     int       m_iLatentSendsBandwidth;
     CLuaMain* m_pLatentSendsLuaMain;
     ushort    m_usLatentSendsResourceNetId;
+    uint      m_LastSentHandle;
 
     CMtaVersion m_strPrevMinClientKickRequirement;
     CMtaVersion m_strPrevMinClientConnectRequirement;

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -229,7 +229,8 @@ bool CStaticFunctionDefinitions::TriggerClientEvent(const std::vector<CPlayer*>&
     return true;
 }
 
-bool CStaticFunctionDefinitions::TriggerLatentClientEvent(const std::vector<CPlayer*>& sendList, const char* szName, CElement* pCallWithElement,
+uint CStaticFunctionDefinitions::TriggerLatentClientEvent(const std::vector<CPlayer*>& sendList, const char* szName,
+                                                                              CElement* pCallWithElement,
                                                           CLuaArguments& Arguments, int iBandwidth, CLuaMain* pLuaMain, ushort usResourceNetId)
 {
     assert(szName);
@@ -246,7 +247,7 @@ bool CStaticFunctionDefinitions::TriggerLatentClientEvent(const std::vector<CPla
     g_pGame->EnableLatentSends(false);
 
     CPerfStatEventPacketUsage::GetSingleton()->UpdateEventUsageOut(szName, sendList.size());
-    return true;
+    return g_pGame->GetLastSentHandle();
 }
 
 bool CStaticFunctionDefinitions::CancelEvent(bool bCancel, const char* szReason)

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -34,8 +34,8 @@ class CStaticFunctionDefinitions
     static bool RemoveEventHandler(CLuaMain* pLuaMain, const char* szName, CElement* pElement, const CLuaFunctionRef& iLuaFunction);
     static bool TriggerEvent(const char* szName, CElement* pElement, const CLuaArguments& Arguments, bool& bWasCancelled);
     static bool TriggerClientEvent(const std::vector<CPlayer*>& sendList, const char* szName, CElement* pCallWithElement, CLuaArguments& Arguments);
-    static bool TriggerLatentClientEvent(const std::vector<CPlayer*>& sendList, const char* szName, CElement* pCallWithElement, CLuaArguments& Arguments,
-                                         int iBandwidth, CLuaMain* pLuaMain, ushort usResourceNetId);
+    static uint TriggerLatentClientEvent(const std::vector<CPlayer*>& sendList, const char* szName, CElement* pCallWithElement,
+                                                             CLuaArguments& Arguments, int iBandwidth, CLuaMain* pLuaMain, ushort usResourceNetId);
 
     static bool        CancelEvent(bool bCancel, const char* szReason);
     static const char* GetCancelReason();

Server/mods/deathmatch/logic/luadefs/CLuaFunctionDefs.Event.cpp

@@ -310,15 +310,17 @@ int CLuaFunctionDefs::TriggerLatentClientEvent(lua_State* luaVM)
         markerLatentEvent.SetAndStoreString(SString("Get args (%d,%s)", sendList.size(), *strName));
 
         // Trigger it
-        if (CStaticFunctionDefinitions::TriggerLatentClientEvent(sendList, strName, pCallWithElement, Arguments, iBandwidth, pLuaMain, usResourceNetId))
+        uint handle = CStaticFunctionDefinitions::TriggerLatentClientEvent(sendList, strName, pCallWithElement, Arguments, iBandwidth, pLuaMain, usResourceNetId);
+        if (handle >= 0)
         {
             markerLatentEvent.Set("End");
 
             // Add debug info if wanted
             if (CPerfStatDebugInfo::GetSingleton()->IsActive("TriggerLatentClientEvent"))
                 CPerfStatDebugInfo::GetSingleton()->AddLine("TriggerLatentClientEvent", markerLatentEvent.GetString());
 
-            lua_pushboolean(luaVM, true);
+            // Return the handle id
+            lua_pushnumber(luaVM, handle);
             return 1;
         }
     }