aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-07 21:59:38 +02:00
parent 26fa0ba2aa dffe845a95
commit 3c59d444a4
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReallifeGamemode.Server/Events/Register.cs
View File

@@ -20,11 +20,18 @@ namespace ReallifeGamemode.Server.Events
string username = player.Name; string username = player.Name;
using (var dbContext = new DatabaseContext()) 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) 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."); 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 var user = new User
{ {

2
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -809,7 +809,7 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("CLIENT:InteractionMenu_CallService_Sani")] [RemoteEvent("CLIENT:InteractionMenu_CallService_Sani")]
public void CallServiceSani(Player player) 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."); player.SendNotification("~r~[Fehler] ~w~Du kannst keinen Sanitäter rufen.");
return; return;

2
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -74,7 +74,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
if (player.IsInVehicle) 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(); Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 2).FirstOrDefault();
if (veh == null) if (veh == null)