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

Add Header Comments, Add 'null'-Checks on Commands

Browse Source
This commit is contained in:
hydrant
2018-09-19 12:50:43 +02:00
parent 91e2fbe4ec
commit e4efbc8ef6
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Server/Commands/Admin.cs
View File

@@ -19,7 +19,7 @@ namespace reallife_gamemode.Server.Commands
[Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)]
public void CmdAdminO(Client player, string message)
{
if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER))
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
@@ -32,15 +32,13 @@ namespace reallife_gamemode.Server.Commands
[Command("veh", "~m~Benutzung:~s~ /veh [Fahrzeug] (Farbe 1) (Farbe 2)")]
public void CmdAdminVeh(Client player, VehicleHash hash, int color1 = 111, int color2 = 111)
{
// Alternative: siehe O Chat
int playerAdminLevel = 1;
if (playerAdminLevel < /* Benötigtes Level */ 1)
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
if(player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs)
if (player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan schon in einem Fahrzeug.");
return;
@@ -54,7 +52,7 @@ namespace reallife_gamemode.Server.Commands
[Command("fixveh")]
public void CmdAdminFixveh(Client player)
{
if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER))
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
@@ -72,8 +70,7 @@ namespace reallife_gamemode.Server.Commands
[Command("delveh")]
public void CmdAdminDelveh(Client player)
{
int playerAdminLevel = 1;
if (playerAdminLevel < /* Benötigtes Level */ 1)
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
@@ -94,7 +91,7 @@ namespace reallife_gamemode.Server.Commands
[Command("goto", "~m~Benutzung:~s~ /goto [Name]")]
public void CmdAdminGoto(Client player, string name)
{
if (!player.GetUser().IsAdmin(AdminLevel.SUPPORTER))
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;

9
Server/Extensions/ClientExtension.cs
View File

@@ -3,17 +3,24 @@ using reallife_gamemode.Model;
using reallife_gamemode.Server.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace reallife_gamemode.Server.Extensions
{
public static class ClientExtension
{
/**
* @overview Life of German Reallife - Client Extension (ClientExtension.cs)
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
public static User GetUser(this Client client)
{
using(DatabaseContext dbContext = new DatabaseContext())
{
return dbContext.Users.Find(client.Name);
return dbContext.Users.FirstOrDefault(u => u.Name == client.Name);
}
}
}

6
Server/Services/ChatService.cs
View File

@@ -7,6 +7,12 @@ namespace reallife_gamemode.Server.Services
{
class ChatService
{
/**
* @overview Life of German Reallife - Chat Service (ChatService.cs)
* @author hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
public static void NotAuthorized(Client player)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du kannst diesen Befehl nicht ausführen.");

6
Server/Util/AdminLevel.cs
View File

@@ -6,6 +6,12 @@ namespace reallife_gamemode.Server.Util
{
public enum AdminLevel : int
{
/**
* @overview Life of German Reallife - Admin Levels (AdminLevel.cs)
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
PLAYER,
SUPPORTER,
ADMIN