From c9452c0fca896bf4ff8485d5ba7cfc7a7639622a Mon Sep 17 00:00:00 2001 From: Fabian Wessels Date: Wed, 7 Apr 2021 21:20:34 +0200 Subject: [PATCH 1/3] sigas mangelnde deutschkenntnisse korrigiert --- ReallifeGamemode.Server/Managers/InventoryManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index c8befc54..c8a88470 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -74,7 +74,7 @@ namespace ReallifeGamemode.Server.Managers { if (player.IsInVehicle) { - player.TriggerEvent("Error", "Du kannst dein Kofferraum nicht betätigen."); + player.TriggerEvent("Error", "Du kannst deinen Kofferraum gerade nicht öffnen."); } Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 2).FirstOrDefault(); if (veh == null) From e93db47d8e07cc149f9940f247cd842c988c7c79 Mon Sep 17 00:00:00 2001 From: Fabian Wessels Date: Wed, 7 Apr 2021 21:49:47 +0200 Subject: [PATCH 2/3] sanitaeter koennen onduty keine sanitaeter rufen --- ReallifeGamemode.Client/Login/main.ts | 3 +++ ReallifeGamemode.Server/Managers/InteractionManager.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/Login/main.ts b/ReallifeGamemode.Client/Login/main.ts index 3fe6e020..c0aa02b1 100644 --- a/ReallifeGamemode.Client/Login/main.ts +++ b/ReallifeGamemode.Client/Login/main.ts @@ -51,6 +51,9 @@ export default function (globalData: IGlobalData): void { }); mp.events.add('CEF:Login_RegisterRequest', (password: string) => { + if (password.length < 6) { + return; + } mp.events.callRemote('CLIENT:Login_RegisterRequest', password); }); diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 5072f79c..b6542171 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -809,7 +809,7 @@ namespace ReallifeGamemode.Server.Managers [RemoteEvent("CLIENT:InteractionMenu_CallService_Sani")] public void CallServiceSani(Player player) { - if (player.GetUser().FactionId == 2) + if (player.GetUser().FactionId == 2 && player.IsDuty()) { player.SendNotification("~r~[Fehler] ~w~Du kannst keinen Sanitäter rufen."); return; From dffe845a954c3c6a9a5540ed458f7277fd3a796b Mon Sep 17 00:00:00 2001 From: Fabian Wessels Date: Wed, 7 Apr 2021 21:57:25 +0200 Subject: [PATCH 3/3] passwort muss aus mindestens 6 zeichen bestehen --- ReallifeGamemode.Client/Login/main.ts | 3 --- ReallifeGamemode.Server/Events/Register.cs | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/Login/main.ts b/ReallifeGamemode.Client/Login/main.ts index c0aa02b1..3fe6e020 100644 --- a/ReallifeGamemode.Client/Login/main.ts +++ b/ReallifeGamemode.Client/Login/main.ts @@ -51,9 +51,6 @@ export default function (globalData: IGlobalData): void { }); mp.events.add('CEF:Login_RegisterRequest', (password: string) => { - if (password.length < 6) { - return; - } mp.events.callRemote('CLIENT:Login_RegisterRequest', password); }); diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs index 3a18f8a7..28ecacc0 100644 --- a/ReallifeGamemode.Server/Events/Register.cs +++ b/ReallifeGamemode.Server/Events/Register.cs @@ -20,11 +20,18 @@ namespace ReallifeGamemode.Server.Events string username = player.Name; using (var dbContext = new DatabaseContext()) { + if (password.Length < 6) + { + player.TriggerEvent("SERVER:Login_Error", "Das Passwort muss aus mindestens 6 Zeichen bestehen."); + return; + } if (dbContext.Users.Where(u => u.SocialClubName == player.SocialClubName).Count() >= 3) { player.TriggerEvent("SERVER:Login_Error", "Es sind schon 3 Konten mit dieser Socialclub-ID registriert."); + return; } - else if (!dbContext.Users.Any(u => u.Name.ToLower() == username.ToLower().Trim())) + + if (!dbContext.Users.Any(u => u.Name.ToLower() == username.ToLower().Trim())) { var user = new User {