v0.19.14.0

2022-10-20 17:05:24 +03:00
parent 35c6bd2526
commit 6cddd03918
62 changed files with 578 additions and 338 deletions
@@ -16,7 +16,7 @@ namespace Barotrauma
        /// <summary>
        /// There is a client-side implementation of the method in <see cref="CampaignMode"/>
        /// </summary>
-        public bool AllowedToManageCampaign(Client client, ClientPermissions permissions)
+        public static bool AllowedToManageCampaign(Client client, ClientPermissions permissions)
        {
            //allow managing the campaign if the client has permissions, is the owner, or the only client in the server,
            //or if no-one has management permissions
@@ -25,7 +25,8 @@ namespace Barotrauma
                client.HasPermission(ClientPermissions.ManageCampaign) ||
                GameMain.Server.ConnectedClients.Count == 1 ||
                IsOwner(client) ||
-                GameMain.Server.ConnectedClients.None(c => c.InGame && (IsOwner(c) || c.HasPermission(permissions)));
+                //allow managing if no-one with permissions is alive
+                GameMain.Server.ConnectedClients.None(c => c.InGame && c.Character is { IsIncapacitated: false, IsDead: false } &&  (IsOwner(c) || c.HasPermission(permissions)));
        }

        public bool AllowedToManageWallets(Client client)
@@ -1019,7 +1019,7 @@ namespace Barotrauma
                UpgradeManager.PurchaseUpgrade(prefab, category, client: sender);

                // unstable logging
-                int price = prefab.Price.GetBuyprice(UpgradeManager.GetUpgradeLevel(prefab, category), Map?.CurrentLocation);
+                int price = prefab.Price.GetBuyPrice(UpgradeManager.GetUpgradeLevel(prefab, category), Map?.CurrentLocation);
                int level = UpgradeManager.GetUpgradeLevel(prefab, category);
                GameServer.Log($"SERVER: Purchased level {level} {category.Identifier}.{prefab.Identifier} for {price}", ServerLog.MessageType.ServerMessage);
            }