Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-05-10 11:55:46 -03:00
parent 768a1f309c 235d42b34f
commit 2c45c3d020
273 changed files with 5739 additions and 2421 deletions
@@ -24,11 +24,28 @@ namespace Barotrauma.Networking
        }

        protected readonly Callbacks callbacks;
+        private readonly ImmutableArray<ContentPackage> contentPackages;

        protected ServerPeer(Callbacks callbacks)
        {
            this.callbacks = callbacks;
-        }
+
+            List<ContentPackage> contentPackageList = new List<ContentPackage>();
+            foreach (var cp in ContentPackageManager.EnabledPackages.All)
+            {
+                if (!cp.Files.Any()) { continue; }
+                if (!cp.HasMultiplayerSyncedContent && !cp.Files.All(f => f is SubmarineFile)) { continue; }
+                if (cp.UgcId.TryUnwrap(out var id1) &&
+                    contentPackageList.FirstOrDefault(cp => cp.UgcId.TryUnwrap(out var id2) && id1.Equals(id2)) is ContentPackage existingPackage)
+                {
+                    //there can be multiple enabled mods with the same UgcId if the player has e.g. created a local copy of a workshop mod
+                    DebugConsole.AddWarning($"The content package \"{existingPackage.Name}\" ({existingPackage.Path}) has the same id as \"{cp.Name}\" ({cp.Path}). Ignoring the latter package.");
+                    continue; 
+                }
+                contentPackageList.Add(cp);
+            }
+            contentPackages = contentPackageList.ToImmutableArray();
+    }
        
        public abstract void InitializeSteamServerCallbacks();

@@ -255,9 +272,7 @@ namespace Barotrauma.Networking
                    structToSend = new ServerPeerContentPackageOrderPacket
                    {
                        ServerName = GameMain.Server.ServerName,
-                        ContentPackages = ContentPackageManager.EnabledPackages.All
-                            .Where(cp => cp.Files.Any())
-                            .Where(cp => cp.HasMultiplayerSyncedContent || cp.Files.All(f => f is SubmarineFile))
+                        ContentPackages = contentPackages
                            .Select(contentPackage => new ServerContentPackage(contentPackage, timeNow))
                            .ToImmutableArray()
                    };