From d3805f2cfd2e062d2cab23b3f0dc3ff80115d9a7 Mon Sep 17 00:00:00 2001
From: Lion Kortlepel <development@kortlepel.com>
Date: Sun, 29 Sep 2024 01:57:15 +0200
Subject: [PATCH] fix mod deleting misnamed mods

---
 src/Network/Resources.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Network/Resources.cpp b/src/Network/Resources.cpp
index c8651cb..93cd2fa 100644
--- a/src/Network/Resources.cpp
+++ b/src/Network/Resources.cpp
@@ -399,7 +399,8 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
 
     std::string t;
     for (const auto& mod : ModInfos) {
-        t += mod.FileName + ";";
+        auto FileName = std::filesystem::path(mod.FileName).stem().string() + "-" + mod.Hash.substr(0, 8) + std::filesystem::path(mod.FileName).extension().string();
+        t += FileName + ";";
     }
 
     if (t.empty())
@@ -436,11 +437,13 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
 #endif
                 debug("Mod name: " + modname);
                 auto name = std::filesystem::path(GetGamePath()) / "mods/multiplayer" / modname;
-                std::filesystem::path tmp_name = name;
-                tmp_name.replace_extension(".tmp");
+                std::string tmp_name = name.string();
+                tmp_name += ".tmp";
 
                 fs::copy_file(PathToSaveTo, tmp_name, fs::copy_options::overwrite_existing);
+                debug("Copying '" + PathToSaveTo + "' to '" + tmp_name + "'");
                 fs::rename(tmp_name, name);
+                debug("Renaming '" + tmp_name + "' to '" + std::string(name) + "'");
             } catch (std::exception& e) {
                 error("Failed copy to the mods folder! " + std::string(e.what()));
                 Terminate = true;