Merge https://github.com/Regalis11/Barotrauma

2022-10-20 12:14:02 -03:00
parent 032572de52 a6ee9eadf3
commit 599db6be5e
63 changed files with 579 additions and 339 deletions
@@ -17,7 +17,7 @@ namespace Barotrauma.Items.Components
        {
            var allowOutpostAutoDocking = (AllowOutpostAutoDocking)msg.ReadByte();
            if (outpostAutoDockingPromptShown &&
-                (GameMain.GameSession?.Campaign?.AllowedToManageCampaign(c, ClientPermissions.ManageMap) ?? false))
+                CampaignMode.AllowedToManageCampaign(c, ClientPermissions.ManageMap))
            {
                this.allowOutpostAutoDocking = allowOutpostAutoDocking;
            }