Unstable 1.2.1.0

2023-11-10 17:45:19 +02:00
parent 2ea58c58a7
commit 8a2e2ea0ae
268 changed files with 4076 additions and 1843 deletions
@@ -118,26 +118,13 @@ namespace Barotrauma

        private void CheckContentPackage()
        {
-            //TODO: reimplement using only core package?
-            /*foreach (ContentPackage contentPackage in Config.AllEnabledPackages)
+            if (Version < VanillaContent.GameVersion)
            {
-                var exePaths = contentPackage.GetFilesOfType(ContentType.ServerExecutable);
-                if (exePaths.Count() > 0 && AppDomain.CurrentDomain.FriendlyName != exePaths.First())
-                {
-                    DebugConsole.NewMessage(AppDomain.CurrentDomain.FriendlyName);
-                    DebugConsole.ShowQuestionPrompt(TextManager.GetWithVariables("IncorrectExe", new string[2] { "[selectedpackage]", "[exename]" }, new string[2] { contentPackage.Name, exePaths.First() }),
-                        (option) =>
-                        {
-                            if (option.ToLower() == "y" || option.ToLower() == "yes")
-                            {
-                                string fullPath = Path.GetFullPath(exePaths.First());
-                                ToolBox.OpenFileWithShell(fullPath);
-                                ShouldRun = false;
-                            }
-                        });
-                    break;
-                }
-            }*/
+                DebugConsole.ThrowError(
+                    TextManager.GetWithVariables("versionmismatchwarning",
+                        ("[gameversion]", Version.ToString()),
+                        ("[contentversion]", VanillaContent.GameVersion.ToString())));
+            }
        }

        public void StartServer()