Fix: revert changes to error message

Valheim-Modding · Nov 24, 2024 · 74592b2 · 74592b2
1 parent 525183d
commit 74592b2
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/JotunnLib/Utils/ModCompatibility/ModCompatibility.cs b/JotunnLib/Utils/ModCompatibility/ModCompatibility.cs
@@ -217,28 +217,27 @@ internal static bool CompareVersionData(ModuleVersionData serverData, ModuleVers
                 return true;
             }
 
+            // Check for compatible ModModule data layout versions
+            //if (serverData.ModModuleDataLayout != clientData.ModModuleDataLayout)
+            //{
+            //    Logger.LogWarning("Jotunn versions on server and client are not compatible.");
+            //    return false;
+            //}
+
+            bool result = true;
+
             // Check for supported ModModule data layout
             if (!clientData.IsSupportedDataLayout)
             {
                 Logger.LogWarning($"Jotunn version on client is higher than server version: {Main.Version}");
-                return false;
+                result = false;
             }
-
             if (!serverData.IsSupportedDataLayout)
             {
                 Logger.LogWarning($"Jotunn version on server is higher than client version: {Main.Version}");
-                return false;
-            }
-
-            // Check for compatible ModModule data layout versions
-            if (serverData.ModModuleDataLayout != clientData.ModModuleDataLayout)
-            {
-                Logger.LogWarning("Jotunn versions on server and client are not compatible.");
-                return false;
+                result = false;
             }
 
-            bool result = true;
-
             // Check server enforced mods
             foreach (var serverModule in FindNotInstalledMods(serverData, clientData))
             {
@@ -350,13 +349,13 @@ private static void OpenTroubleshootingPage()
         /// <returns></returns>
         private static string CreateErrorMessage(ModuleVersionData serverData, ModuleVersionData clientData)
         {
-            string dataLayoutErrMsg = CreateModModuleLayoutErrorMessage(serverData, clientData);
-            if (!string.IsNullOrEmpty(dataLayoutErrMsg))
-            {
-                return CreateVanillaVersionErrorMessage(serverData, clientData) +
-                       dataLayoutErrMsg +
-                       CreateFurtherStepsMessage();
-            }
+            //string dataLayoutErrMsg = CreateModModuleLayoutErrorMessage(serverData, clientData);
+            //if (!string.IsNullOrEmpty(dataLayoutErrMsg))
+            //{
+            //    return CreateVanillaVersionErrorMessage(serverData, clientData) +
+            //           dataLayoutErrMsg +
+            //           CreateFurtherStepsMessage();
+            //}
 
             return CreateVanillaVersionErrorMessage(serverData, clientData) +
                    CreateNotInstalledErrorMessage(serverData, clientData) +