chore(um): async -> sync

Author: skuzzis

src/addons/addons.cpp

@@ -131,8 +131,6 @@ bool Addons::SendNetMessage(CNetMessage* pData, NetChannelBufType_t bufType)
 {
     CServerSideClient* pClient = META_IFACEPTR(CServerSideClient);
     NetMessageInfo_t* info = pData->GetNetMessage()->GetNetMessageInfo();
-    if (!UserMessages_SendNetMessage(pClient->GetNetChannel(), pData, bufType))
-        RETURN_META_VALUE(MRES_SUPERCEDE, false);
 
     if (info->m_MessageId != 7 || g_addons.GetStatus() == false || g_addons.GetAddons().size() == 0)
         RETURN_META_VALUE(MRES_IGNORED, true);

src/entrypoint.cpp

@@ -113,6 +113,7 @@ Patches* g_Patches = nullptr;
 CallStack* g_callStack = nullptr;
 EventManager* eventManager = nullptr;
 HTTPManager* g_httpManager = nullptr;
+UserMessages* g_userMessages = nullptr;
 VoiceManager g_voiceManager;
 
 //////////////////////////////////////////////////////////////
@@ -173,6 +174,7 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
     g_ResourceMonitor = new ResourceMonitor();
     g_callStack = new CallStack();
     eventManager = new EventManager();
+    g_userMessages = new UserMessages();
 
     if (g_Config->LoadConfiguration())
         PRINT("The configurations has been succesfully loaded.\n");
@@ -191,6 +193,7 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 
     g_addons.LoadAddons();
     g_addons.Initialize();
+    g_userMessages->Initialize();
     eventManager->Initialize();
 
     if (!InitializeHooks())
@@ -266,6 +269,7 @@ bool Swiftly::Unload(char* error, size_t maxlen)
 {
     g_addons.Destroy();
     g_voiceManager.OnShutdown();
+    g_userMessages->Destroy();
 
     g_pluginManager->StopPlugins();
     g_pluginManager->UnloadPlugins();
@@ -285,6 +289,25 @@ bool Swiftly::Unload(char* error, size_t maxlen)
 
     g_pGameEntitySystem->RemoveListenerEntity(&g_entityListener);
 
+    delete g_commandsManager;
+    delete g_Config;
+    delete g_conFilter;
+    delete g_translations;
+    delete g_Logger;
+    delete g_playerManager;
+    delete g_pluginManager;
+    delete g_Offsets;
+    delete g_Signatures;
+    delete g_precacher;
+    delete g_dbManager;
+    delete g_MenuManager;
+    delete g_ResourceMonitor;
+    delete g_Patches;
+    delete g_callStack;
+    delete eventManager;
+    delete g_httpManager;
+    delete g_userMessages;
+
     ConVar_Unregister();
     return true;
 }

src/sdk/entity/CRecipientFilters.h

@@ -62,6 +62,14 @@ class CRecipientFilter : public IRecipientFilter
         }
     }
 
+    void RemoveRecipient(CPlayerSlot slot)
+    {
+        if (m_Recipients.Find(slot) == m_Recipients.InvalidIndex())
+            return;
+
+        m_Recipients.FindAndRemove(slot);
+    }
+
 private:
     // Can't copy this unless we explicitly do it!
     CRecipientFilter(CRecipientFilter const& source)

src/usermessages/usermessages.cpp

@@ -1,14 +1,33 @@
 #include "usermessages.h"
-#include <map>
+#include "../sdk/entity/CRecipientFilters.h"
 
-bool UserMessages_SendNetMessage(INetChannel* pNetChan, CNetMessage* pData, NetChannelBufType_t bufType)
+SH_DECL_HOOK6_void(IGameEventSystem, PostEventAbstract, SH_NOATTRIB, 0, CSplitScreenSlot, bool, IRecipientFilter*, INetworkMessageInternal*, const CNetMessage*, unsigned long)
+
+void UserMessages::Initialize()
+{
+    SH_ADD_HOOK_MEMFUNC(IGameEventSystem, PostEventAbstract, g_pGameEventSystem, this, &UserMessages::PostEvent, false);
+}
+
+void UserMessages::Destroy()
+{
+    SH_REMOVE_HOOK_MEMFUNC(IGameEventSystem, PostEventAbstract, g_pGameEventSystem, this, &UserMessages::PostEvent, false);
+}
+
+void UserMessages::PostEvent(CSplitScreenSlot nSlot, bool bLocalOnly, IRecipientFilter* filter, INetworkMessageInternal* pEvent, const CNetMessage* pData, unsigned long nSize)
 {
-    auto netmsg = pData->GetNetMessage();
-    int playerid = FindClientByNetChannel(pNetChan);
+    CRecipientFilter* flt = (CRecipientFilter*)filter;
+    std::vector<CPlayerSlot> players;
+    for (int i = 0; i < flt->GetRecipientCount(); i++)
+        players.push_back(flt->GetRecipientIndex(i));
 
     PluginEvent* event = new PluginEvent("core", nullptr, nullptr);
-    auto result = g_pluginManager->ExecuteEvent("core", "OnUserMessageSend", encoders::msgpack::SerializeToString({ playerid, string_format("%p", netmsg), bufType == BUF_RELIABLE }), event);
-    delete event;
 
-    return (result != EventResult::Stop);
+    for (auto player : players)
+    {
+        auto result = g_pluginManager->ExecuteEvent("core", "OnUserMessageSend", encoders::msgpack::SerializeToString({ player.Get(), string_format("%p", pEvent), filter->GetNetworkBufType() == BUF_RELIABLE }), event);
+        if (result == EventResult::Stop)
+            flt->RemoveRecipient(player);
+    }
+
+    delete event;
 }

src/usermessages/usermessages.h

@@ -4,6 +4,13 @@
 #include "../plugins/core/scripting.h"
 
 int FindClientByNetChannel(INetChannel* pNetChan);
-bool UserMessages_SendNetMessage(INetChannel* pNetChan, CNetMessage* pData, NetChannelBufType_t bufType);
+
+class UserMessages {
+public:
+    void Initialize();
+    void Destroy();
+
+    void PostEvent(CSplitScreenSlot nSlot, bool bLocalOnly, IRecipientFilter* filter, INetworkMessageInternal* pEvent, const CNetMessage* pData, unsigned long nSize);
+};
 
 #endif