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

Resolve merge conflict

Browse Source
This commit is contained in:
VegaZ
2018-09-27 20:33:13 +02:00
parent d148c26a4c 93818ed28d
commit ee652c9a91
6 changed files with 356 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Server/Events/Connect.cs
View File

@@ -6,10 +6,13 @@ using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using reallife_gamemode.Model;
using reallife_gamemode.Server.Entities;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Services;
using reallife_gamemode.Server.Util;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
* @author VegaZ
* @author VegaZ, xSprite
* @copyright (c) 2008 - 2018 Life of German
*/
@@ -23,7 +26,21 @@ namespace reallife_gamemode.Server.Events
player.SetData("isLoggedIn", false);
player.Position = new Vector3(-1883.736, -781.4911, -10);
player.FreezePosition = true;
string name = player.Name;
List<Client> playerlist = NAPI.Pools.GetAllPlayers();
foreach (Client currentPlayer in playerlist)
{
if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? false)
{
if (player.GetData("isLoggedIn"))
{
player.SendChatMessage("~m~*** "+player.Name+"["+player.SocialClubName+"] [ID:"+player.Handle.Value+"] ("+player.Address+")");
}
}
}
}
<<<<<<< HEAD
[RemoteEvent("IsPlayerBanned")]
public void IsPlayerBanned(Client player)
{
@@ -55,5 +72,7 @@ namespace reallife_gamemode.Server.Events
}
}
=======
>>>>>>> 93818ed28ddf5427bc20581af533e442290ed7e0
}
}
}