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

NEUER LOGIN SCREEEEEEEEEEN

Browse Source
This commit is contained in:
hydrant
2020-05-04 23:03:39 +02:00
parent b61c57a2d1
commit 36cacd4775
47 changed files with 18613 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReallifeGamemode.Server/Events/Connect.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database;
@@ -26,10 +26,13 @@ namespace ReallifeGamemode.Server.Events
player.SetData("isLoggedIn", false);
player.Position = new Vector3(-1883.736, -781.4911, -10);
bool registered = false;
using (var dbContext = new DatabaseContext())
{
if (!dbContext.WhitelistEntries.Any(w => w.SocialClubName.ToLower() == player.SocialClubName.ToLower()))
registered = dbContext.Users.Where(u => u.Name == player.Name).Any();
if (!dbContext.WhitelistEntries.Any(w => w.SocialClubName == player.SocialClubName))
{
string msg2 = "~m~*** " + player.Name + "[" + player.SocialClubName + "] (" + player.Address + ") hat versucht, sich einzuloggen, steht aber nicht auf der Whitelist.";
ChatService.BroadcastAdmin(msg2, AdminLevel.ADMIN);
@@ -43,13 +46,16 @@ namespace ReallifeGamemode.Server.Events
}
}
registered = false;
if (IsPlayerBanned(player)) return;
NAPI.Task.Run(() =>
{
player.TriggerEvent("CLIENT:PlaySound", "music/login", "mp3", 20);
}, delayTime: 1000);
player.TriggerEvent("SERVER:Login_ShowBrowser");
player.TriggerEvent("SERVER:Login_ShowBrowser", registered);
string msg = "~m~*** " + player.Name + " [" + player.SocialClubName + "] [ID: " + player.Handle.Value + "] (" + player.Address + ")";
ChatService.BroadcastAdmin(msg, AdminLevel.ADMIN);

10
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Server.Extensions;
@@ -23,8 +23,10 @@ namespace ReallifeGamemode.Server.Events
public class Login : Script
{
[RemoteEvent("CLIENT:Login_LoginRequest")]
public void OnPlayerLogin(Player player, string username, string password)
public void OnPlayerLogin(Player player, string password)
{
string username = player.Name;
using (var dbContext = new DatabaseContext())
{
var user = dbContext.Users
@@ -34,7 +36,7 @@ namespace ReallifeGamemode.Server.Events
if (user == null)
{
player.TriggerEvent("SERVER:Login_Error", "Benutzer existiert nicht! Registriere dich zuerst!");
player.TriggerEvent("SERVER:Login_Error", "Der Benutzer existiert nicht! Registriere dich zuerst!");
}
else
{
@@ -43,7 +45,9 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("SERVER:Login_Error", "Dieser Benutzer gehört dir nicht!");
//TODO ?? Log einbauen für den bösen Bub.
player.Kick();
return;
}
if (user.Password != NAPI.Util.GetHashSha256(password))
{
player.TriggerEvent("SERVER:Login_Error", "Passwort inkorrekt!");

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

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Database.Entities;
@@ -14,8 +14,9 @@ namespace ReallifeGamemode.Server.Events
class Register : Script
{
[RemoteEvent("CLIENT:Login_RegisterRequest")]
public void OnPlayerRegister(Player player, string username, string password, string passwordRepeat)
public void OnPlayerRegister(Player player, string password)
{
string username = player.Name;
using (var dbContext = new DatabaseContext())
{
if (dbContext.Users.Where(u => u.SocialClubName == player.SocialClubName).Count() >= 3)