From b24ff8802f4385b2108fb24cab9ddcd2bf616d9f Mon Sep 17 00:00:00 2001
From: Fernando Rocha <34967844+Fernando-A-Rocha@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:37:32 +0000
Subject: [PATCH 1/4] Add new mtaserver.conf rules for server browser/list (PR
 #3761)

---
 Server/mods/deathmatch/editor.conf            |  22 +++
 Server/mods/deathmatch/local.conf             |  22 +++
 Server/mods/deathmatch/logic/CGame.cpp        |   7 +-
 Server/mods/deathmatch/logic/CMainConfig.cpp  | 172 ++++++++++++------
 Server/mods/deathmatch/logic/CMainConfig.h    |   2 +
 Server/mods/deathmatch/mtaserver.conf         |  24 ++-
 .../mods/deathmatch/mtaserver.conf.template   |  22 +++
 7 files changed, 211 insertions(+), 60 deletions(-)

diff --git a/Server/mods/deathmatch/editor.conf b/Server/mods/deathmatch/editor.conf
index 1355e673ee..1a9b16041e 100644
--- a/Server/mods/deathmatch/editor.conf
+++ b/Server/mods/deathmatch/editor.conf
@@ -3,6 +3,28 @@
     <!-- This parameter specifies the name the server will be visible as in the ingame server browser
          and on Game-Monitor. It is a required parameter. -->
     <servername>Map Editor Server</servername>
+
+    <!-- The rule parameters are optional settings that the server will make public for the server browser/list.
+         A brief description of the server. -->
+    <rule name="description" value="" />
+
+    <!-- A comma separated list of languages that the server supports (e.g. en). -->
+    <rule name="languages" value="" />
+
+    <!-- A comma separated list of tags that describe the server (e.g. freeroam,roleplay). -->
+    <rule name="tags" value="" />
+
+    <!-- The URL of the server's website. -->
+    <rule name="website_url" value="" />
+
+    <!-- A social media URL #1 (e.g. Discord). -->
+    <rule name="social_url_1" value="" />
+
+    <!-- A social media URL #2 (e.g. YouTube). -->
+    <rule name="social_url_2" value="" />
+
+    <!-- A social media URL #3 (e.g. Facebook). -->
+    <rule name="social_url_3" value="" />
     
     <!-- This parameter specifies the contact email addresses for the owner(s) of this server.
          The email addresses will not be publicly available, and only used by MTA administrators
diff --git a/Server/mods/deathmatch/local.conf b/Server/mods/deathmatch/local.conf
index d30a608781..93b1304c9d 100644
--- a/Server/mods/deathmatch/local.conf
+++ b/Server/mods/deathmatch/local.conf
@@ -3,6 +3,28 @@
     <!-- This parameter specifies the name the server will be visible as in the ingame server browser
          and on Game-Monitor. It is a required parameter. -->
     <servername>Default MTA Server</servername>
+
+    <!-- The rule parameters are optional settings that the server will make public for the server browser/list.
+         A brief description of the server. -->
+    <rule name="description" value="" />
+
+    <!-- A comma separated list of languages that the server supports (e.g. en). -->
+    <rule name="languages" value="" />
+
+    <!-- A comma separated list of tags that describe the server (e.g. freeroam,roleplay). -->
+    <rule name="tags" value="" />
+
+    <!-- The URL of the server's website. -->
+    <rule name="website_url" value="" />
+
+    <!-- A social media URL #1 (e.g. Discord). -->
+    <rule name="social_url_1" value="" />
+
+    <!-- A social media URL #2 (e.g. YouTube). -->
+    <rule name="social_url_2" value="" />
+
+    <!-- A social media URL #3 (e.g. Facebook). -->
+    <rule name="social_url_3" value="" />
     
     <!-- This parameter specifies the contact email addresses for the owner(s) of this server.
          The email addresses will not be publicly available, and only used by MTA administrators
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
index 1bcdf5ce66..fe8d5397fe 100644
--- a/Server/mods/deathmatch/logic/CGame.cpp
+++ b/Server/mods/deathmatch/logic/CGame.cpp
@@ -979,10 +979,15 @@ bool CGame::Start(int iArgumentCount, char* szArguments[])
         }
     }
 
-    // If ASE is enabled
+    // Init ASE
     m_pASE = new ASE(m_pMainConfig, m_pPlayerManager, static_cast<int>(usServerPort), strServerIPList);
     if (m_pMainConfig->GetSerialVerificationEnabled())
         m_pASE->SetRuleValue("SerialVerification", "yes");
+
+    // Set the Rules loaded from config
+    for (const auto& [key, value] : m_pMainConfig->GetRulesForASE())
+        m_pASE->SetRuleValue(key, value);
+
     ApplyAseSetting();
     m_pMasterServerAnnouncer = new CMasterServerAnnouncer();
     m_pMasterServerAnnouncer->Pulse();
diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
index 49c73419ca..3305923b5a 100644
--- a/Server/mods/deathmatch/logic/CMainConfig.cpp
+++ b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -135,6 +135,21 @@ bool CMainConfig::Load()
         return false;
     }
 
+    // Grab rules
+    CXMLNode* currentNode = nullptr;
+    std::size_t currentIndex = 0;
+    while (currentNode = m_pRootNode->FindSubNode("rule", currentIndex++))
+    {
+        CXMLAttribute* attribute = currentNode->GetAttributes().Find("name");
+        SString ruleName = attribute ? attribute->GetValue() : SString{};
+
+        attribute = currentNode->GetAttributes().Find("value");
+        SString ruleValue = attribute ? attribute->GetValue() : SString{};
+
+        if (!ruleName.empty() && !ruleValue.empty())
+            m_RulesForASEMap[std::move(ruleName)] = std::move(ruleValue);
+    }
+  
     // Strip spaces from beginning and end of server name
     m_strServerName = SString(m_strServerName).TrimStart(" ").TrimEnd(" ");
 
@@ -237,43 +252,37 @@ bool CMainConfig::Load()
     GetInteger(m_pRootNode, "verifyclientsettings", m_iEnableClientChecks);
 
     // Handle the <client_file> nodes
-    CXMLNode*    pNode = NULL;
-    unsigned int uiCurrentIndex = 0;
-    do
-    {
-        // Grab the current script node
-        pNode = m_pRootNode->FindSubNode("client_file", uiCurrentIndex++);
-        if (pNode)
+    currentNode = nullptr;
+    currentIndex = 0;
+    while (currentNode = m_pRootNode->FindSubNode("client_file", currentIndex++))
+    {
+        // Grab its "name" attribute
+        CXMLAttribute* attribute = currentNode->GetAttributes().Find("name");
+        SString name = attribute ? attribute->GetValue() : SString{};
+        name = name.Replace("\\", "/").ToLower();
+
+        // Grab its "verify" attribute
+        attribute = currentNode->GetAttributes().Find("verify");
+        SString verify = attribute ? attribute->GetValue() : SString{};
+        bool shouldVerify = verify == "true" || verify == "yes" || verify == "1";
+
+        // Find bitnumber
+        bool found = false;
+        for (std::size_t i = 0; i < std::size(gtaDataFiles); i++)
         {
-            // Grab its "name" attribute
-            CXMLAttribute* pAttribute = pNode->GetAttributes().Find("name");
-            SString        strName = pAttribute ? pAttribute->GetValue() : "";
-            strName = strName.Replace("\\", "/").ToLower();
-
-            // Grab its "verify" attribute
-            pAttribute = pNode->GetAttributes().Find("verify");
-            SString strVerify = pAttribute ? pAttribute->GetValue() : "";
-            bool    bVerify = strVerify == "true" || strVerify == "yes" || strVerify == "1";
-
-            // Find bitnumber
-            bool bFound = false;
-            for (uint i = 0; i < NUMELMS(gtaDataFiles); i++)
+            if (name == gtaDataFiles[i].szRealFilename)
             {
-                if (strName == gtaDataFiles[i].szRealFilename)
-                {
-                    if (bVerify)
-                        m_iEnableClientChecks |= 1 << gtaDataFiles[i].iBitNumber;
-                    else
-                        m_iEnableClientChecks &= ~(1 << gtaDataFiles[i].iBitNumber);
-                    bFound = true;
-                    break;
-                }
+                if (shouldVerify)
+                    m_iEnableClientChecks |= 1 << gtaDataFiles[i].iBitNumber;
+                else
+                    m_iEnableClientChecks &= ~(1 << gtaDataFiles[i].iBitNumber);
+                found = true;
+                break;
             }
-
-            if (!bFound)
-                CLogger::ErrorPrintf("Unknown client_file '%s'\n", *strName);
         }
-    } while (pNode);
+        if (!found)
+            CLogger::ErrorPrintf("Unknown client_file '%s'\n", *name);
+    }
 
     // allow_gta3_img_mods
     SString strImgMods;
@@ -855,44 +864,91 @@ bool CMainConfig::AddMissingSettings()
     if (!g_pGame->IsUsingMtaServerConf())
         return false;
 
-    SString strTemplateFilename = PathJoin(g_pServerInterface->GetServerModPath(), "mtaserver.conf.template");
+    const SString templateFileName = PathJoin(g_pServerInterface->GetServerModPath(), "mtaserver.conf.template");
 
-    if (!FileExists(strTemplateFilename))
+    if (!FileExists(templateFileName))
         return false;
 
-    CXMLFile* pFileTemplate = g_pServerInterface->GetXML()->CreateXML(strTemplateFilename);
-    CXMLNode* pRootNodeTemplate = pFileTemplate && pFileTemplate->Parse() ? pFileTemplate->GetRootNode() : nullptr;
-    if (!pRootNodeTemplate)
+    CXMLFile* templateFile = g_pServerInterface->GetXML()->CreateXML(templateFileName);
+    CXMLNode* templateRootNode = templateFile && templateFile->Parse() ? templateFile->GetRootNode() : nullptr;
+    if (!templateRootNode)
     {
-        CLogger::ErrorPrintf("Can't parse '%s'\n", *strTemplateFilename);
+        CLogger::ErrorPrintf("Can't parse '%s'\n", *templateFileName);
         return false;
     }
 
     // Check that each item in the template also exists in the server config
-    bool      bChanged = false;
-    CXMLNode* pPrevNode = nullptr;
-    for (auto it = pRootNodeTemplate->ChildrenBegin(); it != pRootNodeTemplate->ChildrenEnd(); ++it)
-    {
-        CXMLNode* pNodeTemplate = *it;
-        SString   strNodeName = pNodeTemplate->GetTagName();
-        CXMLNode* pNode = m_pRootNode->FindSubNode(strNodeName);
-        if (!pNode)
+    bool      hasConfigChanged = false;
+    CXMLNode* previousNode = nullptr;
+    for (auto it = templateRootNode->ChildrenBegin(); it != templateRootNode->ChildrenEnd(); ++it)
+    {
+        CXMLNode* templateNode = *it;
+        SString   templateNodeTagName = templateNode->GetTagName();
+
+        // Find node with exact same attributes
+        CXMLAttributes& templateAttributes = templateNode->GetAttributes();
+        CXMLNode*       foundNode = nullptr;
+        for (auto it2 = m_pRootNode->ChildrenBegin(); it2 != m_pRootNode->ChildrenEnd(); ++it2)
+        {
+            CXMLNode* tempNode = *it2;
+            if (tempNode->GetTagName() != templateNodeTagName)
+            {
+                continue;
+            }
+            CXMLAttributes& attributes = tempNode->GetAttributes();
+            bool            attributesMatch = true;
+
+            for (auto it3 = templateAttributes.ListBegin(); it3 != templateAttributes.ListEnd(); ++it3)
+            {
+                CXMLAttribute* templateAttribute = *it3;
+                const SString& strKey = templateAttribute->GetName();
+                const SString& strValue = templateAttribute->GetValue();
+
+                CXMLAttribute* foundAttribute = attributes.Find(strKey);
+                if (!foundAttribute || foundAttribute->GetValue() != strValue)
+                {
+                    attributesMatch = false;
+                    break;
+                }
+            }
+
+            if (attributesMatch)
+            {
+                foundNode = tempNode;
+                break;
+            }
+        }
+        // Create missing node if not found
+        if (!foundNode)
         {
-            CLogger::LogPrintf("Adding missing '%s' to mtaserver.conf\n", *strNodeName);
-            SString strNodeValue = pNodeTemplate->GetTagContent();
-            SString strNodeComment = pNodeTemplate->GetCommentText();
-            pNode = m_pRootNode->CreateSubNode(strNodeName, pPrevNode);
-            pNode->SetTagContent(strNodeValue);
-            pNode->SetCommentText(strNodeComment, true);
-            bChanged = true;
+            CLogger::LogPrintf("Adding missing '%s' to mtaserver.conf\n", *templateNodeTagName);
+            SString value = templateNode->GetTagContent();
+            SString commentText = templateNode->GetCommentText();
+            foundNode = m_pRootNode->CreateSubNode(templateNodeTagName, previousNode);
+            foundNode->SetTagContent(value);
+            foundNode->SetCommentText(commentText, true);
+
+            // Copy attributes from template node
+            CXMLAttributes& templateAttributes = templateNode->GetAttributes();
+            for (auto it = templateAttributes.ListBegin(); it != templateAttributes.ListEnd(); ++it)
+            {
+                CXMLAttribute* templateAttribute = *it;
+                const SString& attributeName = templateAttribute->GetName();
+                const SString& attributeValue = templateAttribute->GetValue();
+
+                CXMLAttribute* newAttribute = foundNode->GetAttributes().Create(attributeName);
+                if (newAttribute)
+                    newAttribute->SetValue(attributeValue);
+            }
+            hasConfigChanged = true;
         }
-        pPrevNode = pNode;
+        previousNode = foundNode;
     }
 
     // Clean up
-    g_pServerInterface->GetXML()->DeleteXML(pFileTemplate);
-    FileDelete(strTemplateFilename);
-    return bChanged;
+    g_pServerInterface->GetXML()->DeleteXML(templateFile);
+    FileDelete(templateFileName);
+    return hasConfigChanged;
 }
 
 bool CMainConfig::IsValidPassword(const char* szPassword)
diff --git a/Server/mods/deathmatch/logic/CMainConfig.h b/Server/mods/deathmatch/logic/CMainConfig.h
index 05df0e2f32..22756098ad 100644
--- a/Server/mods/deathmatch/logic/CMainConfig.h
+++ b/Server/mods/deathmatch/logic/CMainConfig.h
@@ -87,6 +87,7 @@ class CMainConfig : public CXMLConfig
     unsigned int                GetScriptDebugLogLevel() { return m_uiScriptDebugLogLevel; };
     const std::string&          GetAccessControlListFile() { return m_strAccessControlListFile; };
     bool                        GetSerialVerificationEnabled() { return m_bVerifySerials; };
+    const std::map<SString, SString>& GetRulesForASE() const noexcept { return m_RulesForASEMap; };
     bool                        IsDisableAC(const char* szTagAC) { return MapContains(m_DisableComboACMap, szTagAC); };
     bool                        IsEnableDiagnostic(const char* szTag) { return MapContains(m_EnableDiagnosticMap, szTag); };
     CMtaVersion                 GetMinClientVersion() { return m_strMinClientVersion; }
@@ -193,6 +194,7 @@ class CMainConfig : public CXMLConfig
     unsigned short             m_usFPSLimit;
     int                        m_bDontBroadcastLan;
     std::set<SString>          m_DisableComboACMap;
+    std::map<SString, SString> m_RulesForASEMap;
     std::set<SString>          m_EnableDiagnosticMap;
     std::vector<SString>       m_AuthSerialGroupList;
     bool                       m_bAuthSerialHttpEnabled;
diff --git a/Server/mods/deathmatch/mtaserver.conf b/Server/mods/deathmatch/mtaserver.conf
index 726199d548..79a306fc19 100644
--- a/Server/mods/deathmatch/mtaserver.conf
+++ b/Server/mods/deathmatch/mtaserver.conf
@@ -3,7 +3,29 @@
     <!-- This parameter specifies the name the server will be visible as in the ingame server browser
          and on Game-Monitor. It is a required parameter. -->
     <servername>Default MTA Server</servername>
-    
+
+    <!-- The rule parameters are optional settings that the server will make public for the server browser/list.
+         A brief description of the server. -->
+    <rule name="description" value="" />
+
+    <!-- A comma separated list of languages that the server supports (e.g. en). -->
+    <rule name="languages" value="" />
+
+    <!-- A comma separated list of tags that describe the server (e.g. freeroam,roleplay). -->
+    <rule name="tags" value="" />
+
+    <!-- The URL of the server's website. -->
+    <rule name="website_url" value="" />
+
+    <!-- A social media URL #1 (e.g. Discord). -->
+    <rule name="social_url_1" value="" />
+
+    <!-- A social media URL #2 (e.g. YouTube). -->
+    <rule name="social_url_2" value="" />
+
+    <!-- A social media URL #3 (e.g. Facebook). -->
+    <rule name="social_url_3" value="" />
+
     <!-- This parameter specifies the contact email addresses for the owner(s) of this server.
          The email addresses will not be publicly available, and only used by MTA administrators
          to contact the server owner.
diff --git a/Server/mods/deathmatch/mtaserver.conf.template b/Server/mods/deathmatch/mtaserver.conf.template
index 13237b1b10..1cb27e157e 100644
--- a/Server/mods/deathmatch/mtaserver.conf.template
+++ b/Server/mods/deathmatch/mtaserver.conf.template
@@ -4,6 +4,28 @@
     <!-- This parameter specifies the name the server will be visible as in the ingame server browser
          and on Game-Monitor. It is a required parameter. -->
     <servername>Default MTA Server</servername>
+
+    <!-- The rule parameters are optional settings that the server will make public for the server browser/list.
+         A brief description of the server. -->
+    <rule name="description" value="" />
+
+    <!-- A comma separated list of languages that the server supports (e.g. en). -->
+    <rule name="languages" value="" />
+
+    <!-- A comma separated list of tags that describe the server (e.g. freeroam,roleplay). -->
+    <rule name="tags" value="" />
+
+    <!-- The URL of the server's website. -->
+    <rule name="website_url" value="" />
+
+    <!-- A social media URL #1 (e.g. Discord). -->
+    <rule name="social_url_1" value="" />
+
+    <!-- A social media URL #2 (e.g. YouTube). -->
+    <rule name="social_url_2" value="" />
+
+    <!-- A social media URL #3 (e.g. Facebook). -->
+    <rule name="social_url_3" value="" />
     
     <!-- This parameter specifies the contact email addresses for the owner(s) of this server.
          The email addresses will not be publicly available, and only used by MTA administrators

From 6f5fb9c65ee93a5c1692b0d3516a483dcea48f08 Mon Sep 17 00:00:00 2001
From: Marek Kulik <noreply@bug32.com>
Date: Thu, 2 Jan 2025 23:06:55 +0100
Subject: [PATCH 2/4] Allow user to pass multiple resource names to
 start/stop/restart (Fixes #3918)

---
 .../deathmatch/logic/CConsoleCommands.cpp     | 209 ++++++++++--------
 Server/mods/deathmatch/logic/CMainConfig.cpp  |   6 +-
 2 files changed, 122 insertions(+), 93 deletions(-)

diff --git a/Server/mods/deathmatch/logic/CConsoleCommands.cpp b/Server/mods/deathmatch/logic/CConsoleCommands.cpp
index a22c872eeb..c6fddcf152 100644
--- a/Server/mods/deathmatch/logic/CConsoleCommands.cpp
+++ b/Server/mods/deathmatch/logic/CConsoleCommands.cpp
@@ -62,85 +62,104 @@ static void EndConsoleOutputCapture(CClient* pClient, const SString& strIfNoOutp
 
 bool CConsoleCommands::StartResource(CConsole* pConsole, const char* szArguments, CClient* pClient, CClient* pEchoClient)
 {
-    SString strResponse;
+    if (!szArguments || !szArguments[0])
+    {
+        pEchoClient->SendConsole("* Syntax: start <resource1> <resource2> ...");
+        return false;
+    }
 
-    if (szArguments && szArguments[0])
+    if (pClient->GetNick())
+        CLogger::LogPrintf("start: Requested by %s\n", GetAdminNameForLog(pClient).c_str());
+
+    CSplitString      resourceNames(szArguments, " ");
+    CResourceManager* resourceManager = g_pGame->GetResourceManager();
+
+    for (const std::string& resourceName : resourceNames)
     {
-        CResource* resource = g_pGame->GetResourceManager()->GetResource(szArguments);
-        if (resource)
+        CResource* resource = resourceManager->GetResource(resourceName.c_str());
+
+        if (!resource)
         {
-            if (pClient->GetNick())
-                CLogger::LogPrintf("start: Requested by %s\n", GetAdminNameForLog(pClient).c_str());
+            pEchoClient->SendConsole(SString("start: Resource '%s' could not be found", resourceName.c_str()));
+            continue;
+        }
 
-            if (resource->IsLoaded())
-            {
-                if (!resource->IsActive())
-                {
-                    if (g_pGame->GetResourceManager()->StartResource(resource, NULL, true))
-                    {
-                        strResponse = SString("start: Resource '%s' started", szArguments);
-                    }
-                    else
-                    {
-                        strResponse = SString("start: Resource '%s' start was requested (%s)", szArguments, resource->GetFailureReason().c_str());
-                    }
-                }
-                else
-                    strResponse = "start: Resource is already running";
-            }
-            else
-                strResponse = SString("start: Resource is loaded, but has errors (%s)", resource->GetFailureReason().c_str());
+        if (!resource->IsLoaded())
+        {
+            pEchoClient->SendConsole(SString("start: Resource '%s' is loaded, but has errors (%s)", resourceName.c_str(), resource->GetFailureReason().c_str()));
+            continue;
+        }
+
+        if (resource->IsActive())
+        {
+            pEchoClient->SendConsole(SString("start: Resource '%s' is already running", resourceName.c_str()));
+            continue;
+        }
+
+        if (resourceManager->StartResource(resource, nullptr, true))
+        {
+            pEchoClient->SendConsole(SString("start: Resource '%s' started", resourceName.c_str()));
         }
         else
-            strResponse = "start: Resource could not be found";
+        {
+            pEchoClient->SendConsole(SString("start: Resource '%s' start was requested (%s)", resourceName.c_str(), resource->GetFailureReason().c_str()));
+        }
     }
-    else
-        strResponse = "* Syntax: start <resource-name>";
 
-    pEchoClient->SendConsole(strResponse);
     return true;
 }
 
 bool CConsoleCommands::RestartResource(CConsole* pConsole, const char* szArguments, CClient* pClient, CClient* pEchoClient)
 {
-    if (szArguments && szArguments[0])
+    if (!szArguments || !szArguments[0])
     {
-        CResource* resource = g_pGame->GetResourceManager()->GetResource(szArguments);
-        if (resource)
+        pEchoClient->SendConsole("* Syntax: restart <resource1> <resource2> ...");
+        return false;
+    }
+
+    if (pClient->GetNick())
+        CLogger::LogPrintf("restart: Requested by %s\n", GetAdminNameForLog(pClient).c_str());
+
+    CSplitString      resourceNames(szArguments, " ");
+    CResourceManager* resourceManager = g_pGame->GetResourceManager();
+
+    for (const std::string& resourceName : resourceNames)
+    {
+        CResource* resource = resourceManager->GetResource(resourceName.c_str());
+
+        if (!resource)
         {
-            if (pClient->GetNick())
-                CLogger::LogPrintf("restart: Requested by %s\n", GetAdminNameForLog(pClient).c_str());
+            pEchoClient->SendConsole(SString("restart: Resource '%s' could not be found", resourceName.c_str()));
+            continue;
+        }
 
-            if (resource->IsLoaded())
-            {
-                if (resource->IsActive())
-                {
-                    if (resource->IsProtected())
-                    {
-                        if (!g_pGame->GetACLManager()->CanObjectUseRight(pClient->GetNick(), CAccessControlListGroupObject::OBJECT_TYPE_USER,
-                                                                         "restart.protected", CAccessControlListRight::RIGHT_TYPE_COMMAND, false))
-                        {
-                            pEchoClient->SendConsole("restart: Resource could not be restarted as it is protected");
-                            return false;
-                        }
-                    }
+        if (!resource->IsLoaded())
+        {
+            pEchoClient->SendConsole(SString("restart: Resource '%s' is loaded, but has errors (%s)", resourceName.c_str(), resource->GetFailureReason().c_str()));
+            continue;
+        }
 
-                    g_pGame->GetResourceManager()->QueueResource(resource, CResourceManager::QUEUE_RESTART, NULL);
-                    pEchoClient->SendConsole("restart: Resource restarting...");
-                }
-                else
-                    pEchoClient->SendConsole("restart: Resource is not running");
+        if (!resource->IsActive())
+        {
+            pEchoClient->SendConsole(SString("restart: Resource '%s' is not running", resourceName.c_str()));
+            continue;
+        }
+
+        if (resource->IsProtected())
+        {
+            if (!g_pGame->GetACLManager()->CanObjectUseRight(pClient->GetNick(), CAccessControlListGroupObject::OBJECT_TYPE_USER, "restart.protected",
+                                                             CAccessControlListRight::RIGHT_TYPE_COMMAND, false))
+            {
+                pEchoClient->SendConsole(SString("restart: Resource '%s' could not be restarted as it is protected", resourceName.c_str()));
+                continue;
             }
-            else
-                pEchoClient->SendConsole(SString("restart: Resource is loaded, but has errors (%s)", resource->GetFailureReason().c_str()));
         }
-        else
-            pEchoClient->SendConsole("restart: Resource could not be found");
-        return true;
+
+        resourceManager->QueueResource(resource, CResourceManager::QUEUE_RESTART, nullptr);
+        pEchoClient->SendConsole(SString("restart: Resource '%s' restarting...", resourceName.c_str()));
     }
-    else
-        pEchoClient->SendConsole("* Syntax: restart <resource-name>");
-    return false;
+
+    return true;
 }
 
 bool CConsoleCommands::RefreshResources(CConsole* pConsole, const char* szArguments, CClient* pClient, CClient* pEchoClient)
@@ -195,45 +214,55 @@ bool CConsoleCommands::ResourceInfo(CConsole* pConsole, const char* szArguments,
 
 bool CConsoleCommands::StopResource(CConsole* pConsole, const char* szArguments, CClient* pClient, CClient* pEchoClient)
 {
-    if (szArguments && szArguments[0])
+    if (!szArguments || !szArguments[0])
     {
-        CResource* resource = g_pGame->GetResourceManager()->GetResource(szArguments);
-        if (resource)
+        pEchoClient->SendConsole("* Syntax: stop <resource1> <resource2> ...");
+        return false;
+    }
+
+    if (pClient->GetNick())
+        CLogger::LogPrintf("stop: Requested by %s\n", GetAdminNameForLog(pClient).c_str());
+
+    CSplitString      resourceNames(szArguments, " ");
+    CResourceManager* resourceManager = g_pGame->GetResourceManager();
+
+    for (const std::string& resourceName : resourceNames)
+    {
+        CResource* resource = resourceManager->GetResource(resourceName.c_str());
+
+        if (!resource)
         {
-            if (pClient->GetNick())
-                CLogger::LogPrintf("stop: Requested by %s\n", GetAdminNameForLog(pClient).c_str());
+            pEchoClient->SendConsole(SString("stop: Resource '%s' could not be found", resourceName.c_str()));
+            continue;
+        }
 
-            if (resource->IsLoaded())
-            {
-                if (resource->IsActive())
-                {
-                    if (resource->IsProtected())
-                    {
-                        if (!g_pGame->GetACLManager()->CanObjectUseRight(pClient->GetNick(), CAccessControlListGroupObject::OBJECT_TYPE_USER, "stop.protected",
-                                                                         CAccessControlListRight::RIGHT_TYPE_COMMAND, false))
-                        {
-                            pEchoClient->SendConsole("stop: Resource could not be stopped as it is protected");
-                            return false;
-                        }
-                    }
+        if (!resource->IsLoaded())
+        {
+            pEchoClient->SendConsole(SString("stop: Resource '%s' is loaded, but has errors (%s)", resourceName.c_str(), resource->GetFailureReason().c_str()));
+            continue;
+        }
 
-                    g_pGame->GetResourceManager()->QueueResource(resource, CResourceManager::QUEUE_STOP, NULL);
-                    pEchoClient->SendConsole("stop: Resource stopping");
-                }
-                else
-                    pEchoClient->SendConsole("stop: Resource is not running");
+        if (!resource->IsActive())
+        {
+            pEchoClient->SendConsole(SString("stop: Resource '%s' is not running", resourceName.c_str()));
+            continue;
+        }
+
+        if (resource->IsProtected())
+        {
+            if (!g_pGame->GetACLManager()->CanObjectUseRight(pClient->GetNick(), CAccessControlListGroupObject::OBJECT_TYPE_USER, "stop.protected",
+                                                             CAccessControlListRight::RIGHT_TYPE_COMMAND, false))
+            {
+                pEchoClient->SendConsole(SString("stop: Resource '%s' could not be stopped as it is protected", resourceName.c_str()));
+                continue;
             }
-            else
-                pEchoClient->SendConsole(SString("stop: Resource is loaded, but has errors (%s)", resource->GetFailureReason().c_str()));
         }
-        else
-            pEchoClient->SendConsole("stop: Resource could not be found");
-        return true;
+
+        resourceManager->QueueResource(resource, CResourceManager::QUEUE_STOP, nullptr);
+        pEchoClient->SendConsole(SString("stop: Resource '%s' stopping...", resourceName.c_str()));
     }
-    else
-        pEchoClient->SendConsole("* Syntax: stop <resource-name>");
 
-    return false;
+    return true;
 }
 
 bool CConsoleCommands::StopAllResources(CConsole* pConsole, const char* szArguments, CClient* pClient, CClient* pEchoClient)
diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
index 3305923b5a..ec5bf9b9d9 100644
--- a/Server/mods/deathmatch/logic/CMainConfig.cpp
+++ b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -768,10 +768,10 @@ bool CMainConfig::LoadExtended()
     CLogger::SetMinLogLevel(LOGLEVEL_LOW);
 
     // Register the commands
-    RegisterCommand("start", CConsoleCommands::StartResource, false, "Usage: start <resource-name>\nStart a loaded resource eg: start admin");
-    RegisterCommand("stop", CConsoleCommands::StopResource, false, "Usage: stop <resource-name>\nStop a resource eg: stop admin");
+    RegisterCommand("start", CConsoleCommands::StartResource, false, "Usage: start <resource1> <resource2> ...\nStart a loaded resource eg: start admin");
+    RegisterCommand("stop", CConsoleCommands::StopResource, false, "Usage: stop <resource1> <resource2> ...\nStop a resource eg: stop admin");
     RegisterCommand("stopall", CConsoleCommands::StopAllResources, false, "Stop all running resources");
-    RegisterCommand("restart", CConsoleCommands::RestartResource, false, "Usage: restart <resource-name>\nRestarts a running resource eg: restart admin");
+    RegisterCommand("restart", CConsoleCommands::RestartResource, false, "Usage: restart <resource1> <resource2> ...\nRestarts a running resource eg: restart admin");
     RegisterCommand("refresh", CConsoleCommands::RefreshResources, false, "Refresh resource list to find new resources");
     RegisterCommand("refreshall", CConsoleCommands::RefreshAllResources, false, "Refresh resources and restart any changed resources");
     RegisterCommand("list", CConsoleCommands::ListResources, false, "Shows a list of resources");

From 0f9e18dd25087c0d5aa9cdd4cb06efbc35dde73e Mon Sep 17 00:00:00 2001
From: Marek Kulik <noreply@bug32.com>
Date: Thu, 2 Jan 2025 23:25:26 +0100
Subject: [PATCH 3/4] Fix TSplitString compile error on Linux/macOS

---
 Shared/sdk/SString.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Shared/sdk/SString.h b/Shared/sdk/SString.h
index 00c57d0c1e..4874073652 100644
--- a/Shared/sdk/SString.h
+++ b/Shared/sdk/SString.h
@@ -124,6 +124,8 @@ struct SCharStringRef
 template <class STRING_TYPE, class CHAR_TYPE>
 class TSplitString : public std::vector<const CHAR_TYPE*>
 {
+    using std::vector<const CHAR_TYPE*>::push_back;
+
 public:
     TSplitString() {}
     TSplitString(const STRING_TYPE& strInput, const STRING_TYPE& strDelim, unsigned int uiMaxAmount = 0, unsigned int uiMinAmount = 0)

From c0b47ea386cba67dd8537665675c7ddf84b4ff7c Mon Sep 17 00:00:00 2001
From: FileEX <alkom@t.pl>
Date: Fri, 3 Jan 2025 02:28:00 +0100
Subject: [PATCH 4/4] Add spawnFlyingComponent & breakGlass arguments for
 setVehiclePanelState (PR #3920, Fixes #2122)

Previous attempt in 5b69d700c848e36b2f427bbc6ba5b2c905592783
---
 Client/game_sa/CAEVehicleAudioEntitySA.h      |  5 +
 Client/game_sa/CAutomobileSA.cpp              | 70 ++++++++++++++
 Client/game_sa/CAutomobileSA.h                | 12 +++
 Client/game_sa/CDamageManagerSA.cpp           | 78 ++++++++--------
 Client/game_sa/CDamageManagerSA.h             | 16 +++-
 Client/game_sa/CModelInfoSA.cpp               |  5 +
 Client/game_sa/CModelInfoSA.h                 | 91 +++++++++++--------
 Client/game_sa/CVehicleSA.cpp                 |  2 +-
 Client/game_sa/CVehicleSA.h                   |  5 +
 .../mods/deathmatch/logic/CClientVehicle.cpp  |  4 +-
 Client/mods/deathmatch/logic/CClientVehicle.h |  2 +-
 .../logic/CStaticFunctionDefinitions.cpp      |  6 +-
 .../logic/CStaticFunctionDefinitions.h        |  2 +-
 .../logic/luadefs/CLuaVehicleDefs.cpp         |  5 +-
 .../deathmatch/logic/rpc/CVehicleRPCs.cpp     | 10 +-
 Client/sdk/game/CDamageManager.h              | 14 +--
 .../logic/CStaticFunctionDefinitions.cpp      |  6 +-
 .../logic/CStaticFunctionDefinitions.h        |  2 +-
 .../logic/luadefs/CLuaVehicleDefs.cpp         |  6 +-
 Shared/sdk/SharedUtil.Math.h                  |  9 ++
 Shared/sdk/net/bitstream.h                    |  6 +-
 21 files changed, 255 insertions(+), 101 deletions(-)

diff --git a/Client/game_sa/CAEVehicleAudioEntitySA.h b/Client/game_sa/CAEVehicleAudioEntitySA.h
index cb4ff8699d..45f169299c 100644
--- a/Client/game_sa/CAEVehicleAudioEntitySA.h
+++ b/Client/game_sa/CAEVehicleAudioEntitySA.h
@@ -73,6 +73,11 @@ static_assert(sizeof(CAETwinLoopSoundEntity) == 0xA8, "Invalid size for CAETwinL
 class CAEVehicleAudioEntitySAInterface : public CAEAudioEntity
 {
 public:
+    void AddAudioEvent(int eventId, float volume)
+    {
+        ((void(__thiscall*)(CAEVehicleAudioEntitySAInterface*, int, float))0x4F6420)(this, eventId, volume);
+    }
+
     short                  unk1;                                      // +124
     char                   unk2[2];                                   // +126
     tVehicleAudioSettings  m_nSettings;                               // +128
diff --git a/Client/game_sa/CAutomobileSA.cpp b/Client/game_sa/CAutomobileSA.cpp
index 59205e86e1..0dc82e6b1b 100644
--- a/Client/game_sa/CAutomobileSA.cpp
+++ b/Client/game_sa/CAutomobileSA.cpp
@@ -11,9 +11,79 @@
 
 #include "StdInc.h"
 #include "CAutomobileSA.h"
+#include "CGameSA.h"
+
+extern CGameSA* pGame;
 
 CAutomobileSA::CAutomobileSA(CAutomobileSAInterface* pInterface)
 {
     SetInterface(pInterface);
     Init();
 }
+
+void CAutomobileSAInterface::SetPanelDamage(std::uint8_t panelId, bool breakGlass, bool spawnFlyingComponent)
+{
+    int nodeId = CDamageManagerSA::GetCarNodeIndexFromPanel(panelId);
+    if (nodeId < 0)
+        return;
+
+    eCarNodes node = static_cast<eCarNodes>(nodeId);
+
+    RwFrame* frame = m_aCarNodes[nodeId];
+    if (!frame)
+        return;
+
+    CVehicleModelInfoSAInterface* vehicleInfo = nullptr;
+    if (auto* mi = pGame->GetModelInfo(m_nModelIndex))
+        vehicleInfo = static_cast<CVehicleModelInfoSAInterface*>(mi->GetInterface());
+
+    if (!vehicleInfo || !vehicleInfo->IsComponentDamageable(nodeId))
+        return;
+
+    switch (m_damageManager.GetPanelStatus(panelId))
+    {
+        case DT_PANEL_DAMAGED:
+        {
+            if ((pHandlingData->uiModelFlags & 0x10000000) != 0) // check bouncePanels flag
+                return;
+
+            if (node != eCarNodes::WINDSCREEN && node != eCarNodes::WING_LF && node != eCarNodes::WING_RF)
+            {
+                // Get free bouncing panel
+                for (auto& panel : m_panels)
+                {
+                    if (panel.m_nFrameId == (std::uint16_t)0xFFFF)
+                    {
+                        panel.SetPanel(nodeId, 1, GetRandomNumberInRange(-0.2f, -0.5f));
+                        break;
+                    }
+                }
+            }
+
+            SetComponentVisibility(frame, 2); // ATOMIC_IS_DAM_STATE
+            break;
+        }
+        case DT_PANEL_OPENED:
+        {
+            if (panelId == WINDSCREEN_PANEL)
+                m_VehicleAudioEntity.AddAudioEvent(91, 0.0f);
+
+            SetComponentVisibility(frame, 2); // ATOMIC_IS_DAM_STATE
+            break;
+        }
+        case DT_PANEL_OPENED_DAMAGED:
+        {
+            if (panelId == WINDSCREEN_PANEL)
+            {
+                if (breakGlass)
+                    ((void(__cdecl*)(CAutomobileSAInterface*, bool))0x71C2B0)(this, false); // Call CGlass::CarWindscreenShatters
+            }
+
+            if (spawnFlyingComponent && (panelId != WINDSCREEN_PANEL || (panelId == WINDSCREEN_PANEL && !breakGlass)))
+                SpawnFlyingComponent(node, eCarComponentCollisionTypes::COL_NODE_PANEL);
+
+            SetComponentVisibility(frame, 0); // ATOMIC_IS_NOT_PRESENT
+            break;
+        }
+    }
+}
diff --git a/Client/game_sa/CAutomobileSA.h b/Client/game_sa/CAutomobileSA.h
index 921c6638b3..b2fc09417c 100644
--- a/Client/game_sa/CAutomobileSA.h
+++ b/Client/game_sa/CAutomobileSA.h
@@ -24,6 +24,11 @@
 class CBouncingPanelSAInterface
 {
 public:
+    void SetPanel(std::int16_t frameId, std::int16_t axis, float angleLimit)
+    {
+        ((void(__thiscall*)(CBouncingPanelSAInterface*, std::int16_t, std::int16_t, float))0x6F4920)(this, frameId, axis, angleLimit);
+    }
+
     unsigned short m_nFrameId;
     unsigned short m_nAxis;
     float          m_fAngleLimit;
@@ -35,6 +40,13 @@ static_assert(sizeof(CBouncingPanelSAInterface) == 0x20, "Invalid size for CBoun
 class CAutomobileSAInterface : public CVehicleSAInterface
 {
 public:
+    void SetPanelDamage(std::uint8_t panelId, bool breakGlass, bool spawnFlyingComponent = true);
+
+    CObjectSAInterface* SpawnFlyingComponent(const eCarNodes& nodeId, const eCarComponentCollisionTypes& collType)
+    {
+        return ((CObjectSAInterface*(__thiscall*)(CAutomobileSAInterface*, eCarNodes, eCarComponentCollisionTypes))0x6a8580)(this, nodeId, collType);
+    }
+
     CDamageManagerSAInterface m_damageManager;
     CDoorSAInterface          m_doors[MAX_DOORS];
     RwFrame*                  m_aCarNodes[static_cast<std::size_t>(eCarNodes::NUM_NODES)];
diff --git a/Client/game_sa/CDamageManagerSA.cpp b/Client/game_sa/CDamageManagerSA.cpp
index 372dcaeaa5..d659330afc 100644
--- a/Client/game_sa/CDamageManagerSA.cpp
+++ b/Client/game_sa/CDamageManagerSA.cpp
@@ -11,6 +11,7 @@
 
 #include "StdInc.h"
 #include "CDamageManagerSA.h"
+#include "CAutomobileSA.h"
 
 BYTE CDamageManagerSA::GetEngineStatus()
 {
@@ -98,7 +99,7 @@ void CDamageManagerSA::SetWheelStatus(eWheelPosition bWheel, BYTE bTireStatus)
     }
 }
 
-void CDamageManagerSA::SetPanelStatus(BYTE bPanel, BYTE bPanelStatus)
+void CDamageManagerSA::SetPanelStatus(BYTE bPanel, BYTE bPanelStatus, bool spawnFlyingComponent, bool breakGlass)
 {
     // Valid index?
     if (bPanel < MAX_PANELS && bPanelStatus <= 3)
@@ -122,70 +123,41 @@ void CDamageManagerSA::SetPanelStatus(BYTE bPanel, BYTE bPanelStatus)
             // Intact?
             if (bPanelStatus == DT_PANEL_INTACT)
             {
-                // Grab the car node index for the given panel
-                static int s_iCarNodeIndexes[7] = {0x0F, 0x0E, 0x00 /*?*/, 0x00 /*?*/, 0x12, 0x0C, 0x0D};
-
                 //  Call CAutomobile::FixPanel to update the vehicle
                 dwFunction = 0x6A3670;
                 dwThis = (DWORD)internalEntityInterface;
-                int iCarNodeIndex = s_iCarNodeIndexes[bPanel];
+                int carNodeIndex = GetCarNodeIndexFromPanel(bPanel);
+                if (carNodeIndex < 0)
+                    return;
+
                 _asm
                 {
                     mov     ecx, dwThis
                     push    dwPanel
-                    push    iCarNodeIndex
+                    push    carNodeIndex
                     call    dwFunction
                 }
             }
             else
-            {
-                // Call CAutomobile::SetPanelDamage to update the vehicle
-                dwFunction = 0x6B1480;
-                dwThis = (DWORD)internalEntityInterface;
-                bool bUnknown = false;
-                _asm
-                {
-                    mov     ecx, dwThis
-                    push    bUnknown
-                    push    dwPanel
-                    call    dwFunction
-                }
-            }
+                reinterpret_cast<CAutomobileSAInterface*>(internalEntityInterface)->SetPanelDamage(dwPanel, breakGlass, spawnFlyingComponent);
         }
     }
 }
 
-void CDamageManagerSA::SetPanelStatus(unsigned long ulStatus)
+void CDamageManagerSA::SetPanelStatus(unsigned long ulStatus, bool spawnFlyingComponent, bool breakGlass)
 {
     unsigned int uiIndex;
 
     for (uiIndex = 0; uiIndex < MAX_PANELS; uiIndex++)
     {
-        SetPanelStatus(static_cast<eDoors>(uiIndex), static_cast<unsigned char>(ulStatus));
+        SetPanelStatus(static_cast<eDoors>(uiIndex), static_cast<unsigned char>(ulStatus), spawnFlyingComponent, breakGlass);
         ulStatus >>= 4;
     }
 }
 
-BYTE CDamageManagerSA::GetPanelStatus(BYTE bPanel)
+BYTE CDamageManagerSA::GetPanelStatus(BYTE bPanel) const
 {
-    if (bPanel < MAX_PANELS)
-    {
-        DWORD dwFunction = FUNC_GetPanelStatus;
-        DWORD dwPointer = (DWORD)internalInterface;
-        BYTE  bReturn = 0;
-        DWORD dwPanel = bPanel;
-        _asm
-        {
-            mov     ecx, dwPointer
-            push    dwPanel
-            call    dwFunction
-            mov     bReturn, al
-        }
-
-        return bReturn;
-    }
-
-    return 0;
+    return internalInterface->GetPanelStatus(bPanel);
 }
 
 unsigned long CDamageManagerSA::GetPanelStatus()
@@ -275,3 +247,29 @@ void CDamageManagerSA::FuckCarCompletely(bool bKeepWheels)
         call    dwFunc
     }
 }
+
+int CDamageManagerSA::GetCarNodeIndexFromPanel(std::uint8_t panelId) noexcept
+{
+    int index = -1;
+
+    switch (panelId)
+    {
+        case 0:
+            index = 15; // PANEL_WING_LF
+            break;
+        case 1:
+            index = 14; // PANEL_WING_RF
+            break;
+        case 4:
+            index = 18; // PANEL_WINDSCREEN
+            break;
+        case 5:
+            index = 12; // BUMP_FRONT
+            break;
+        case 6:
+            index = 13; // BUMP_REAR
+            break;
+    }
+
+    return index;
+}
diff --git a/Client/game_sa/CDamageManagerSA.h b/Client/game_sa/CDamageManagerSA.h
index 33f72aeccc..b3fbb72900 100644
--- a/Client/game_sa/CDamageManagerSA.h
+++ b/Client/game_sa/CDamageManagerSA.h
@@ -27,6 +27,14 @@
 class CDamageManagerSAInterface            // 28 bytes due to the way its packed (24 containing actual data)
 {
 public:
+    std::uint8_t GetPanelStatus(std::uint8_t panelId)
+    {
+        if (panelId >= MAX_PANELS)
+            return 0;
+
+        return ((std::uint8_t(__thiscall*)(CDamageManagerSAInterface*, std::uint8_t))FUNC_GetPanelStatus)(this, panelId);
+    }
+
     float fWheelDamageEffect;
     BYTE  bEngineStatus;            // old - wont be used
     BYTE  Wheel[MAX_WHEELS];
@@ -49,10 +57,10 @@ class CDamageManagerSA : public CDamageManager
     void          SetDoorStatus(eDoors bDoor, BYTE bDoorStatus, bool spawnFlyingComponent);
     BYTE          GetWheelStatus(eWheelPosition bWheel);
     void          SetWheelStatus(eWheelPosition bWheel, BYTE bTireStatus);
-    BYTE          GetPanelStatus(BYTE bPanel);
+    BYTE          GetPanelStatus(BYTE bPanel) const;
     unsigned long GetPanelStatus();
-    void          SetPanelStatus(BYTE bPanel, BYTE bPanelStatus);
-    void          SetPanelStatus(unsigned long ulStatus);
+    void          SetPanelStatus(BYTE bPanel, BYTE bPanelStatus, bool spawnFlyingComponent = true, bool breakGlass = false);
+    void          SetPanelStatus(unsigned long ulStatus, bool spawnFlyingComponent = true, bool breakGlass = false);
     BYTE          GetLightStatus(BYTE bLight);
     unsigned char GetLightStatus();
     void          SetLightStatus(BYTE bLight, BYTE bLightStatus);
@@ -62,6 +70,8 @@ class CDamageManagerSA : public CDamageManager
 
     void FuckCarCompletely(bool bKeepWheels);
 
+    static int GetCarNodeIndexFromPanel(std::uint8_t panelId) noexcept;
+
     CDamageManagerSA(class CEntitySAInterface* intEntityInterface, CDamageManagerSAInterface* intInterface)
     {
         internalEntityInterface = intEntityInterface;
diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp
index 9982bcf5bd..1c9e4ed4bf 100644
--- a/Client/game_sa/CModelInfoSA.cpp
+++ b/Client/game_sa/CModelInfoSA.cpp
@@ -2157,3 +2157,8 @@ bool CModelInfoSA::ForceUnload()
 
     return true;
 }
+
+bool CVehicleModelInfoSAInterface::IsComponentDamageable(int componentIndex) const
+{
+    return pVisualInfo->m_maskComponentDamagable & (1 << componentIndex);
+}
diff --git a/Client/game_sa/CModelInfoSA.h b/Client/game_sa/CModelInfoSA.h
index ac55d61f48..6d0e00c758 100644
--- a/Client/game_sa/CModelInfoSA.h
+++ b/Client/game_sa/CModelInfoSA.h
@@ -14,6 +14,7 @@
 #include <game/Common.h>
 #include <game/CModelInfo.h>
 #include "CRenderWareSA.h"
+#include "game/RenderWare.h"
 
 class CPedModelInfoSA;
 class CPedModelInfoSAInterface;
@@ -259,6 +260,14 @@ class CTimeModelInfoSAInterface : public CBaseModelInfoSAInterface
     CTimeInfoSAInterface timeInfo;
 };
 
+class CVehicleModelUpgradePosnDesc
+{
+    CVector m_vPosition;
+    RtQuat  m_vRotation;
+    int     m_iParentId;
+};
+static_assert(sizeof(CVehicleModelUpgradePosnDesc) == 0x20, "Invalid size of CVehicleModelUpgradePosnDesc class");
+
 class CDamageableModelInfoSAInterface : public CBaseModelInfoSAInterface
 {
 public:
@@ -268,51 +277,61 @@ class CDamageableModelInfoSAInterface : public CBaseModelInfoSAInterface
 class CVehicleModelVisualInfoSAInterface            // Not sure about this name. If somebody knows more, please change
 {
 public:
-    CVector vecDummies[15];
-    char    m_sUpgrade[18];
+    CVector                      vecDummies[15];
+    CVehicleModelUpgradePosnDesc m_sUpgrade[18];
+    RpAtomic*                    m_pExtra[6];
+    std::uint8_t                 m_numExtras;
+    std::uint8_t                 _pad[3];
+    int                          m_maskComponentDamagable;
 };
+static_assert(sizeof(CVehicleModelVisualInfoSAInterface) == 0x314, "Invalid size of CVehicleModelVisualInfoSAInterface class");
 
-class CVehicleModelInfoSAInterface : public CBaseModelInfoSAInterface
+class CVehicleModelInfoSAInterface : public CClumpModelInfoSAInterface
 {
 public:
-    uint32                              pad1;                      // +32
-    RpMaterial*                         pPlateMaterial;            // +36
+    bool IsComponentDamageable(int componentIndex) const;
+
+    RpMaterial*                         pPlateMaterial;
     char                                plateText[8];
-    char                                pad[2];
+    std::uint8_t                        field_30;
+    std::uint8_t                        plateType;
     char                                gameName[8];
-    char                                pad2[2];
-    unsigned int                        uiVehicleType;
+    std::uint8_t                        field_3A[2];
+    std::uint32_t                       vehicleType;
     float                               fWheelSizeFront;
     float                               fWheelSizeRear;
-    short                               sWheelModel;
-    short                               sHandlingID;
-    byte                                ucNumDoors;
-    byte                                ucVehicleList;
-    byte                                ucVehicleFlags;
-    byte                                ucWheelUpgradeClass;
-    byte                                ucTimesUsed;
-    short                               sVehFrequency;
-    unsigned int                        uiComponentRules;
-    float                               fSteeringAngle;
-    CVehicleModelVisualInfoSAInterface* pVisualInfo;            // +92
-    char                                pad3[464];
-    char                                pDirtMaterial[64];            // *RwMaterial
-    char                                pad4[64];
-    char                                primColors[8];
-    char                                secondColors[8];
-    char                                treeColors[8];
-    char                                fourColors[8];
-    unsigned char                       ucNumOfColorVariations;
-    unsigned char                       ucLastColorVariation;
-    unsigned char                       ucPrimColor;
-    unsigned char                       ucSecColor;
-    unsigned char                       ucTertColor;
-    unsigned char                       ucQuatColor;
-    char                                upgrades[36];
-    char                                anRemapTXDs[8];
-    char                                pad5[2];
-    char                                pAnimBlock[4];
+    std::int16_t                        wheelModelID;
+    std::int16_t                        handlingID;
+    std::uint8_t                        numDoors;
+    std::uint8_t                        vehicleClass;
+    std::uint8_t                        vehicleFlags;
+    std::uint8_t                        wheelUpgradeClass;
+    std::uint8_t                        timesUsed;
+    std::uint8_t                        field_51;
+    std::int16_t                        vehFrequency;
+    std::uint32_t                       componentRules;
+    float                               bikeSteeringAngle;
+    CVehicleModelVisualInfoSAInterface* pVisualInfo; // vehicleStruct
+    std::uint8_t                        field_60[464];
+    RpMaterial**                        m_dirtMaterials;
+    std::size_t                         m_numDirtMaterials;
+    RpMaterial*                         m_staticDirtMaterials[30];
+    std::uint8_t                        primColors[8];
+    std::uint8_t                        secondColors[8];
+    std::uint8_t                        treeColors[8];
+    std::uint8_t                        fourColors[8];
+    std::uint8_t                        numOfColorVariations;
+    std::uint8_t                        lastColorVariation;
+    std::uint8_t                        primColor;
+    std::uint8_t                        secColor;
+    std::uint8_t                        tertColor;
+    std::uint8_t                        quatColor;
+    std::uint8_t                        upgrades[36];
+    std::uint8_t                        anRemapTXDs[8];
+    std::uint8_t                        field_302[2];
+    void*                               pAnimBlock; // CAnimBlock*
 };
+static_assert(sizeof(CVehicleModelInfoSAInterface) == 0x308, "Invalid size of CVehicleModelInfoSAInterface class");
 
 class CModelInfoSA : public CModelInfo
 {
diff --git a/Client/game_sa/CVehicleSA.cpp b/Client/game_sa/CVehicleSA.cpp
index afb1bf0c42..898add2961 100644
--- a/Client/game_sa/CVehicleSA.cpp
+++ b/Client/game_sa/CVehicleSA.cpp
@@ -1666,7 +1666,7 @@ bool CVehicleSA::SpawnFlyingComponent(const eCarNodes& nodeIndex, const eCarComp
     MemPut(0x6A85B3, nodesOffset);
     MemPut(0x6A8631, nodesOffset);
 
-    auto* componentObject = ((CObjectSAInterface * (__thiscall*)(CVehicleSAInterface*, int, int)) FUNC_CAutomobile__SpawnFlyingComponent)(GetVehicleInterface(), static_cast<int>(nodeIndex), static_cast<int>(collisionType));
+    auto* componentObject = reinterpret_cast<CAutomobileSAInterface*>(GetInterface())->SpawnFlyingComponent(nodeIndex, collisionType);
 
     // Restore default nodes array in CAutomobile::SpawnFlyingComponent
     // CAutomobile::m_aCarNodes offset
diff --git a/Client/game_sa/CVehicleSA.h b/Client/game_sa/CVehicleSA.h
index ca4f496c9b..5c4b332b7c 100644
--- a/Client/game_sa/CVehicleSA.h
+++ b/Client/game_sa/CVehicleSA.h
@@ -274,6 +274,11 @@ class CAutoPilot
 class CVehicleSAInterface : public CPhysicalSAInterface
 {
 public:
+    void SetComponentVisibility(RwFrame* component, std::uint32_t state)
+    {
+        ((void(__thiscall*)(CVehicleSAInterface*, RwFrame*, std::uint32_t))0x6D2700)(this, component, state);
+    }
+
     CAEVehicleAudioEntitySAInterface m_VehicleAudioEntity;            // 312
 
     tHandlingDataSA*       pHandlingData;                  // +900
diff --git a/Client/mods/deathmatch/logic/CClientVehicle.cpp b/Client/mods/deathmatch/logic/CClientVehicle.cpp
index 2c5ef561ef..ffc1fbdbc1 100644
--- a/Client/mods/deathmatch/logic/CClientVehicle.cpp
+++ b/Client/mods/deathmatch/logic/CClientVehicle.cpp
@@ -1521,12 +1521,12 @@ bool CClientVehicle::GetWheelMissing(unsigned char ucWheel, const SString& strWh
     return false;
 }
 
-void CClientVehicle::SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus)
+void CClientVehicle::SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus, bool spawnFlyingComponent, bool breakGlass)
 {
     if (ucPanel < MAX_PANELS)
     {
         if (m_pVehicle && HasDamageModel())
-            m_pVehicle->GetDamageManager()->SetPanelStatus(static_cast<ePanels>(ucPanel), ucStatus);
+            m_pVehicle->GetDamageManager()->SetPanelStatus(static_cast<ePanels>(ucPanel), ucStatus, spawnFlyingComponent, breakGlass);
 
         m_ucPanelStates[ucPanel] = ucStatus;
     }
diff --git a/Client/mods/deathmatch/logic/CClientVehicle.h b/Client/mods/deathmatch/logic/CClientVehicle.h
index faeb4acfec..a316425b1d 100644
--- a/Client/mods/deathmatch/logic/CClientVehicle.h
+++ b/Client/mods/deathmatch/logic/CClientVehicle.h
@@ -292,7 +292,7 @@ class CClientVehicle : public CClientStreamElement
 
     void SetDoorStatus(unsigned char ucDoor, unsigned char ucStatus, bool spawnFlyingComponent);
     void SetWheelStatus(unsigned char ucWheel, unsigned char ucStatus, bool bSilent = true);
-    void SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus);
+    void SetPanelStatus(unsigned char ucPanel, unsigned char ucStatus, bool spawnFlyingComponent = true, bool breakGlass = false);
     void SetLightStatus(unsigned char ucLight, unsigned char ucStatus);
     bool GetWheelMissing(unsigned char ucWheel, const SString& strWheelName = "");
 
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
index 87521a812a..7098e7fdbd 100644
--- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
+++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -3197,9 +3197,9 @@ bool CStaticFunctionDefinitions::SetVehicleLightState(CClientEntity& Entity, uns
     return false;
 }
 
-bool CStaticFunctionDefinitions::SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState)
+bool CStaticFunctionDefinitions::SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent, bool breakGlass)
 {
-    RUN_CHILDREN(SetVehiclePanelState(**iter, ucPanel, ucState))
+    RUN_CHILDREN(SetVehiclePanelState(**iter, ucPanel, ucState, spawnFlyingComponent, breakGlass))
 
     if (IS_VEHICLE(&Entity))
     {
@@ -3207,7 +3207,7 @@ bool CStaticFunctionDefinitions::SetVehiclePanelState(CClientEntity& Entity, uns
 
         if (ucPanel < 7)
         {
-            Vehicle.SetPanelStatus(ucPanel, ucState);
+            Vehicle.SetPanelStatus(ucPanel, ucState, spawnFlyingComponent, breakGlass);
             return true;
         }
     }
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h
index 188e249f2d..17d4fa7edf 100644
--- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h
+++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h
@@ -243,7 +243,7 @@ class CStaticFunctionDefinitions
     static bool SetVehicleDoorState(CClientEntity& Entity, unsigned char ucDoor, unsigned char ucState, bool spawnFlyingComponent);
     static bool SetVehicleWheelStates(CClientEntity& Entity, int iFrontLeft, int iRearLeft = -1, int iFrontRight = -1, int iRearRight = -1);
     static bool SetVehicleLightState(CClientEntity& Entity, unsigned char ucLight, unsigned char ucState);
-    static bool SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState);
+    static bool SetVehiclePanelState(CClientEntity& Entity, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent = true, bool breakGlass = false);
     static bool SetVehicleOverrideLights(CClientEntity& Entity, unsigned char ucLights);
     static bool AttachTrailerToVehicle(CClientVehicle& Vehicle, CClientVehicle& Trailer, const CVector& vecRotationOffsetDegrees);
     static bool DetachTrailerFromVehicle(CClientVehicle& Vehicle, CClientVehicle* pTrailer = NULL);
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
index e9ec1ca94b..ff92f957d5 100644
--- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
+++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
@@ -1956,14 +1956,17 @@ int CLuaVehicleDefs::SetVehiclePanelState(lua_State* luaVM)
 {
     CClientEntity*   pEntity = NULL;
     unsigned char    ucPanel = 0, ucState = 0;
+    bool             spawnFlyingComponent, breakGlass;
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pEntity);
     argStream.ReadNumber(ucPanel);
     argStream.ReadNumber(ucState);
+    argStream.ReadBool(spawnFlyingComponent, true);
+    argStream.ReadBool(breakGlass, false);
 
     if (!argStream.HasErrors())
     {
-        if (CStaticFunctionDefinitions::SetVehiclePanelState(*pEntity, ucPanel, ucState))
+        if (CStaticFunctionDefinitions::SetVehiclePanelState(*pEntity, ucPanel, ucState, spawnFlyingComponent, breakGlass))
         {
             lua_pushboolean(luaVM, true);
             return 1;
diff --git a/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp
index 50d5028caf..78215f30aa 100644
--- a/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp
+++ b/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp
@@ -352,7 +352,15 @@ void CVehicleRPCs::SetVehicleDamageState(CClientEntity* pSource, NetBitStreamInt
                     unsigned char ucPanel, ucState;
                     if (bitStream.Read(ucPanel) && bitStream.Read(ucState))
                     {
-                        pVehicle->SetPanelStatus(ucPanel, ucState);
+                        bool spawnFlyingComponent = true;
+                        bool breakGlass = false;
+                        if (bitStream.Can(eBitStreamVersion::SetVehiclePanelState_SpawnFlyingComponent))
+                        {
+                            bitStream.ReadBit(spawnFlyingComponent);
+                            bitStream.ReadBit(breakGlass);
+                        }
+
+                        pVehicle->SetPanelStatus(ucPanel, ucState, spawnFlyingComponent, breakGlass);
                     }
                 }
                 default:
diff --git a/Client/sdk/game/CDamageManager.h b/Client/sdk/game/CDamageManager.h
index 9c4fcc2348..a764467a5a 100644
--- a/Client/sdk/game/CDamageManager.h
+++ b/Client/sdk/game/CDamageManager.h
@@ -55,12 +55,12 @@ enum ePlaneComponentStatus
     DT_PLANE_MISSING
 };
 
-enum eComponentStatus
+enum eComponentStatus : std::uint8_t
 {
     DT_PANEL_INTACT = 0,
-    //  DT_PANEL_SHIFTED,
-    DT_PANEL_BASHED,
-    DT_PANEL_BASHED2,
+    DT_PANEL_OPENED,
+    DT_PANEL_DAMAGED,
+    DT_PANEL_OPENED_DAMAGED,
     DT_PANEL_MISSING
 };
 
@@ -173,10 +173,10 @@ class CDamageManager
     virtual void          SetDoorStatus(eDoors bDoor, BYTE bDoorStatus, bool spawnFlyingComponent) = 0;
     virtual BYTE          GetWheelStatus(eWheelPosition bTire) = 0;
     virtual void          SetWheelStatus(eWheelPosition bTire, BYTE bTireStatus) = 0;
-    virtual BYTE          GetPanelStatus(BYTE bPanel) = 0;
+    virtual BYTE          GetPanelStatus(BYTE bPanel) const = 0;
     virtual unsigned long GetPanelStatus() = 0;
-    virtual void          SetPanelStatus(BYTE bPanel, BYTE bPanelStatus) = 0;
-    virtual void          SetPanelStatus(unsigned long ulStatus) = 0;
+    virtual void          SetPanelStatus(BYTE bPanel, BYTE bPanelStatus, bool spawnFlyingComponent = true, bool breakGlass = false) = 0;
+    virtual void          SetPanelStatus(unsigned long ulStatus, bool spawnFlyingComponent = true, bool breakGlass = false) = 0;
     virtual BYTE          GetLightStatus(BYTE bLight) = 0;
     virtual unsigned char GetLightStatus() = 0;
     virtual void          SetLightStatus(BYTE bLight, BYTE bLightStatus) = 0;
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
index 2aaf1867bd..c3cebfdce8 100644
--- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
+++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -6719,10 +6719,10 @@ bool CStaticFunctionDefinitions::SetVehicleLightState(CElement* pElement, unsign
     return false;
 }
 
-bool CStaticFunctionDefinitions::SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState)
+bool CStaticFunctionDefinitions::SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent, bool breakGlass)
 {
     assert(pElement);
-    RUN_CHILDREN(SetVehiclePanelState(*iter, ucPanel, ucState))
+    RUN_CHILDREN(SetVehiclePanelState(*iter, ucPanel, ucState, spawnFlyingComponent, breakGlass))
 
     if (IS_VEHICLE(pElement))
     {
@@ -6739,6 +6739,8 @@ bool CStaticFunctionDefinitions::SetVehiclePanelState(CElement* pElement, unsign
                 BitStream.pBitStream->Write(ucObject);
                 BitStream.pBitStream->Write(ucPanel);
                 BitStream.pBitStream->Write(ucState);
+                BitStream.pBitStream->WriteBit(spawnFlyingComponent);
+                BitStream.pBitStream->WriteBit(breakGlass);
                 m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pVehicle, SET_VEHICLE_DAMAGE_STATE, *BitStream.pBitStream));
                 return true;
             }
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
index ea178da19b..52ce191c26 100644
--- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
+++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
@@ -314,7 +314,7 @@ class CStaticFunctionDefinitions
     static bool SetVehicleDoorState(CElement* pElement, unsigned char ucDoor, unsigned char ucState, bool spawnFlyingComponent);
     static bool SetVehicleWheelStates(CElement* pElement, int iFrontLeft, int iRearLeft = -1, int iFrontRight = -1, int iRearRight = -1);
     static bool SetVehicleLightState(CElement* pElement, unsigned char ucLight, unsigned char ucState);
-    static bool SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState);
+    static bool SetVehiclePanelState(CElement* pElement, unsigned char ucPanel, unsigned char ucState, bool spawnFlyingComponent = true, bool breakGlass = false);
     static bool SetVehicleIdleRespawnDelay(CElement* pElement, unsigned long ulTime);
     static bool SetVehicleRespawnDelay(CElement* pElement, unsigned long ulTime);
     static bool GetVehicleRespawnPosition(CElement* pElement, CVector& vecPosition);
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
index 55ab0e0631..b1352f2e9e 100644
--- a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
+++ b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
@@ -2125,15 +2125,19 @@ int CLuaVehicleDefs::SetVehiclePanelState(lua_State* luaVM)
     CElement*     pElement;
     unsigned char ucPanel;
     unsigned char ucState;
+    bool          spawnFlyingComponent;
+    bool          breakGlass;
 
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pElement);
     argStream.ReadNumber(ucPanel);
     argStream.ReadNumber(ucState);
+    argStream.ReadBool(spawnFlyingComponent, true);
+    argStream.ReadBool(breakGlass, false);
 
     if (!argStream.HasErrors())
     {
-        if (CStaticFunctionDefinitions::SetVehiclePanelState(pElement, ucPanel, ucState))
+        if (CStaticFunctionDefinitions::SetVehiclePanelState(pElement, ucPanel, ucState, spawnFlyingComponent, breakGlass))
         {
             lua_pushboolean(luaVM, true);
             return 1;
diff --git a/Shared/sdk/SharedUtil.Math.h b/Shared/sdk/SharedUtil.Math.h
index 32677d4e0c..73c7c532df 100644
--- a/Shared/sdk/SharedUtil.Math.h
+++ b/Shared/sdk/SharedUtil.Math.h
@@ -12,6 +12,7 @@
 
 #include <cmath>
 #include "SharedUtil.Misc.h"
+#include <random>
 
 namespace SharedUtil
 {
@@ -104,4 +105,12 @@ namespace SharedUtil
     }
 
     inline float DegreesToRadians(float fValue) { return fValue * 0.017453292f; }
+
+    static std::random_device randomDevice;
+    static std::mt19937 randomEngine(randomDevice());
+
+    inline float GetRandomNumberInRange(float minRange, float maxRange)
+    {
+        return std::uniform_real_distribution<float>{minRange, maxRange}(randomEngine);
+    }
 }            // namespace SharedUtil
diff --git a/Shared/sdk/net/bitstream.h b/Shared/sdk/net/bitstream.h
index 5c68ec2c2e..7a2d3f10d7 100644
--- a/Shared/sdk/net/bitstream.h
+++ b/Shared/sdk/net/bitstream.h
@@ -589,9 +589,13 @@ enum class eBitStreamVersion : unsigned short
     WorldSpecialPropertyEvent,
 
     // Add setElementOnFire function
-    // 2024-30-12
+    // 2024-12-30
     SetElementOnFire,
 
+    // Add "spawnFlyingComponent" to setVehiclePanelState
+    // 2024-12-31
+    SetVehiclePanelState_SpawnFlyingComponent,
+    
     // This allows us to automatically increment the BitStreamVersion when things are added to this enum.
     // Make sure you only add things above this comment.
     Next,