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

Simplified /cleaned some code parts

Browse Source
This commit is contained in:
hydrant
2018-10-16 11:03:06 +02:00
parent 67acbd6fd9
commit a5e9b07827
4 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Server/Extensions/ClientExtension.cs
View File

@@ -19,9 +19,7 @@ namespace reallife_gamemode.Server.Extensions
{
public static User GetUser(this Client client, DatabaseContext context = null)
{
if (!client.IsLoggedIn()) return null;
using (DatabaseContext dbContext = new DatabaseContext())
if(context == null)
{
using (context = new DatabaseContext())
@@ -39,45 +37,5 @@ namespace reallife_gamemode.Server.Extensions
{
return player.HasData("isLoggedIn") ? player.GetData("isLoggedIn") : false;
}
public static void BanPlayer(Client admin, Client target, string reason, int mins)
{
using (var banUser = new DatabaseContext())
{
int unixTimestamp = (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
Ban user;
if (mins == 0)
{
NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + target.Name + " wurde von " + admin.Name + " permanent gebannt. [" + reason + "]");
user = new Ban { UserId = GetUser(target).Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp };
//TODO user.Kick();
mins--;
}
else
{
NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + target.Name + " wurde von " + admin.Name + " für " + mins + " Minuten gebannt. [" + reason + "]");
user = new Ban { UserId = GetUser(target).Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp + mins * 60 };
//TODO user.Kick();
}
banUser.Bans.Add(user);
banUser.SaveChanges();
var targetUser = banUser.Users.FirstOrDefault(u => u.Name == target.Name);
targetUser.BanId = user.Id;
banUser.SaveChanges();
}
}
public static void UnbanPlayer(Client admin, Client target)
{
using (var unbanUser = new DatabaseContext())
{
var targetUser = unbanUser.Bans.FirstOrDefault(u => u.Id == target.GetUser(unbanUser).BanId);
unbanUser.Bans.Remove(targetUser);
unbanUser.SaveChanges();
}
admin.SendChatMessage(target.Name + " wurde entbannt.");
//TODO ***Admin Info: {ADMIN-NAME} hat {USER-NAME} entbannt.
}
}
}

1
Server/Extensions/FactionExtension.cs
View File

@@ -19,7 +19,6 @@ namespace reallife_gamemode.Server.Extensions
{
public static FactionBankAccount GetFactionBankAccount(this Faction faction, DatabaseContext context = null)
{
using (DatabaseContext dbContext = new DatabaseContext())
if (context == null)
{
using (context = new DatabaseContext())

1
Server/Extensions/UserExtension.cs
View File

@@ -19,7 +19,6 @@ namespace reallife_gamemode.Server.Extensions
{
public static UserBankAccount GetUserBankAccount(this User user, DatabaseContext context = null)
{
using (DatabaseContext dbContext = new DatabaseContext())
if (context == null)
{
using (context = new DatabaseContext())

5
Server/Extensions/VehicleExtension.cs
View File

@@ -18,10 +18,9 @@ namespace reallife_gamemode.Server.Extensions
{
public static class VehicleExtension
{
public static bool IsFactionVehicle(Vehicle vehicle)
public static bool IsFactionVehicle(this Vehicle vehicle)
{
bool containsVehicle = LoadManager.FactionVehicleList.Contains(vehicle);
return containsVehicle;
return LoadManager.FactionVehicleList.Contains(vehicle);
}
}
}