fix(usermessage): GetUserMessage + Destructor

Author: skuzzis

src/entrypoint.cpp

@@ -264,12 +264,13 @@ void Swiftly::AllPluginsLoaded()
 
 bool Swiftly::Unload(char* error, size_t maxlen)
 {
+    g_addons.Destroy();
+    g_voiceManager.OnShutdown();
+
     g_pluginManager->StopPlugins();
     g_pluginManager->UnloadPlugins();
 
     UnloadHooks();
-    g_voiceManager.OnShutdown();
-    g_addons.Destroy();
     eventManager->Shutdown();
 
     SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameFrame, server, this, &Swiftly::Hook_GameFrame, true);

src/plugins/core/scripting.h

@@ -208,7 +208,7 @@ class PluginUserMessage
 
 public:
     PluginUserMessage(std::string msgname);
-    PluginUserMessage(INetworkMessageInternal* msg, NetMessageInfo_t* msgInfo, CNetMessage* pData);
+    PluginUserMessage(INetworkMessageInternal* msg);
     ~PluginUserMessage();
 
     bool IsValidMessage();

src/plugins/core/scripting/usermessage.cpp

@@ -85,20 +85,23 @@ PluginUserMessage::PluginUserMessage(std::string msgname)
     this->internalMsg = msg;
 }
 
-PluginUserMessage::PluginUserMessage(INetworkMessageInternal* msg, NetMessageInfo_t* msgInfo, CNetMessage* pData)
+PluginUserMessage::PluginUserMessage(INetworkMessageInternal* msg)
 {
     this->msgid = INVALID_MESSAGE_ID;
 
-    if (!msgInfo || !pData || !msg) return;
+    if (!msg) return;
 
-    this->msgid = msgInfo->m_MessageId;
-    this->msgBuffer = pData->ToPB<google::protobuf::Message>();
+    NetMessageInfo_t* msginfo = msg->GetNetMessageInfo();
+    if (!msginfo)
+        return;
+
+    this->msgid = msginfo->m_MessageId;
+    this->msgBuffer = msg->AllocateMessage()->ToPB<google::protobuf::Message>();
     this->internalMsg = msg;
 }
 
 PluginUserMessage::~PluginUserMessage()
 {
-    if(this->msgBuffer) delete this->msgBuffer;
 }
 
 bool PluginUserMessage::IsValidMessage()

src/plugins/core/scripting/utils.cpp

@@ -35,12 +35,8 @@ std::string scripting_GetPluginPath(std::string plugin_name)
 
 PluginUserMessage scripting_GetUserMessage(std::string str)
 {
-    auto ptrs = explode(str, "|");
-    if (ptrs.size() != 3) return PluginUserMessage("");
+    if (!starts_with(str, "0x")) return PluginUserMessage("");
 
-    INetworkMessageInternal* msg = (INetworkMessageInternal*)(strtol(ptrs[0].c_str(), nullptr, 16));
-    NetMessageInfo_t* msginfo = (NetMessageInfo_t*)(strtol(ptrs[1].c_str(), nullptr, 16));
-    CNetMessage* data = (CNetMessage*)(strtol(ptrs[2].c_str(), nullptr, 16));
-
-    return PluginUserMessage(msg, msginfo, data);
+    INetworkMessageInternal* msg = (INetworkMessageInternal*)(strtol(str.c_str(), nullptr, 16));
+    return PluginUserMessage(msg);
 }

src/usermessages/usermessages.cpp

@@ -7,7 +7,7 @@ bool UserMessages_SendNetMessage(INetChannel* pNetChan, CNetMessage* pData, NetC
     int playerid = FindClientByNetChannel(pNetChan);
 
     PluginEvent* event = new PluginEvent("core", nullptr, nullptr);
-    auto result = g_pluginManager->ExecuteEvent("core", "OnUserMessageSend", encoders::msgpack::SerializeToString({ playerid, string_format("%p|%p|%p", netmsg, netmsg->GetNetMessageInfo(), pData), bufType == BUF_RELIABLE }), event);
+    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);