Merge remote-tracking branch 'upstream/master' into develop

2024-04-24 12:20:11 -03:00
parent 10ad5d296e ff1b8951a7
commit 0a9ff43986
397 changed files with 15250 additions and 6473 deletions
@@ -277,7 +277,8 @@ namespace Barotrauma.Networking
                        ServerName = GameMain.Server.ServerName,
                        ContentPackages = contentPackages
                            .Select(contentPackage => new ServerContentPackage(contentPackage, timeNow))
-                            .ToImmutableArray()
+                            .ToImmutableArray(),
+                        AllowModDownloads = serverSettings.AllowModDownloads
                    };

                    break;