From c9ec6fe17cf391caad26a557a2d9621fb7e09b00 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 25 Mar 2020 21:59:00 +0100 Subject: [PATCH] motor und einsteigen nur wenn aduty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Der 25. März ist der 84. Tag des gregorianischen Kalenders (der 85. in Schaltjahren), somit verbleiben 281 Tage bis zum Jahresende. --- ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs | 3 ++- ReallifeGamemode.Server/Events/Key.cs | 2 +- ReallifeGamemode.Server/Events/Vehicle.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index 76ec91a3..3922f7be 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -5,6 +5,7 @@ using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Types; +using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.WeaponDeal; namespace ReallifeGamemode.Server.Events @@ -27,7 +28,7 @@ namespace ReallifeGamemode.Server.Events if (vehicle.GetServerVehicle() is FactionVehicle veh) { - if (!veh.GetOwners().Contains(player.GetUser().FactionId ?? 0) && !u.IsAdmin(AdminLevel.HEADADMIN)) + if (!veh.GetOwners().Contains(player.GetUser().FactionId ?? 0) && !u.IsAdmin(AdminLevel.HEADADMIN) && !GlobalHelper.DutyAdmins.Contains(player)) { if ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) { diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 0aa0e636..f6b03c09 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -453,7 +453,7 @@ namespace ReallifeGamemode.Server.Events } else if (sV is FactionVehicle fV) { - if (!fV.GetOwners().Contains(u.FactionId ?? 0) && !state && !u.IsAdmin(AdminLevel.ADMIN3)) + if (!fV.GetOwners().Contains(u.FactionId ?? 0) && !state && !u.IsAdmin(AdminLevel.ADMIN3) && !GlobalHelper.DutyAdmins.Contains(player)) { player.SendNotification("~r~Du hast keinen Schlüssel."); return; diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index a90881b8..71ef09ca 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -38,7 +38,7 @@ namespace ReallifeGamemode.Server.Events } else if (sV is FactionVehicle fV) { - if (!fV.GetOwners().Contains(u.FactionId ?? 0) && !state && !u.IsAdmin(AdminLevel.ADMIN3)) + if (!fV.GetOwners().Contains(u.FactionId ?? 0) && !state && !u.IsAdmin(AdminLevel.ADMIN3) && !GlobalHelper.DutyAdmins.Contains(player)) { player.SendNotification("~r~Du hast keinen Schlüssel."); return;