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
@@ -1,5 +1,4 @@
-using Barotrauma.Extensions;
-using Barotrauma.Networking;
+using Barotrauma.Networking;

 namespace Barotrauma
 {
@@ -27,6 +26,15 @@ namespace Barotrauma
                AnyOneAllowedToManageCampaign(permissions);
        }

+        public static bool AllowImmediateItemDelivery(Client client)
+        {
+            if (client == null || GameMain.Server == null) { return false; }
+            return
+                GameMain.Server.ServerSettings.AllowImmediateItemDelivery ||
+                client.HasPermission(ClientPermissions.ManageCampaign) ||
+                client.Connection == GameMain.Server.OwnerConnection;
+        }
+
        public static bool AllowedToManageWallets(Client client)
        {
            return AllowedToManageCampaign(client, ClientPermissions.ManageMoney);