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

merge conflict

Browse Source
This commit is contained in:
Fabian
2021-05-03 00:38:37 +02:00
parent a6f7d284ac
commit 0850c2e2c8
1 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
@@ -1511,33 +1511,6 @@ namespace ReallifeGamemode.Server.Commands
Medic.delReviveTask(target); Medic.delReviveTask(target);
} }
[Command("aunshow", "~m~Benutzung:~s~ /aunshow")]
public void CmdAdminUnshow(Player player)
{
User user = player.GetUser();
if (!user.IsAdmin(AdminLevel.HEADADMIN))
{
ChatService.NotAuthorized(player);
return;
}
bool currentStatus = user.GetData<bool>("adminUnshow");
currentStatus = !currentStatus;
user.SetData("adminUnshow", currentStatus);
player.TriggerEvent("toggleAdminUnshowMode", currentStatus);
user.SetBlipAndNametagColor();
if(currentStatus)
{
ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du bist nun Unshow");
}
else
{
ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du bist nun nicht mehr Unshow");
}
}
[Command("setap", "~m~Benutzung: ~s~/setap [Spieler] (Armor)")] [Command("setap", "~m~Benutzung: ~s~/setap [Spieler] (Armor)")]
public void CmdAdminSetAP(Player player, string name, int armor = 100) public void CmdAdminSetAP(Player player, string name, int armor = 100)
{ {
@@ -1833,6 +1806,38 @@ namespace ReallifeGamemode.Server.Commands
} }
} }
[Command("aunshow", "~m~Benutzung:~s~ /aunshow")]
public void CmdAdminUnshow(Player player)
{
User user = player.GetUser();
if (!user.IsAdmin(AdminLevel.ADMIN))
{
ChatService.NotAuthorized(player);
return;
}
if (!player.IsTSupport())
{
ChatService.ErrorMessage(player, "Du bist nicht im T-Support");
return;
}
bool currentStatus = user.GetData<bool>("adminUnshow");
currentStatus = !currentStatus;
user.SetData("adminUnshow", currentStatus);
player.TriggerEvent("toggleAdminUnshowMode", currentStatus);
user.SetBlipAndNametagColor();
if (currentStatus)
{
ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du bist nun Unshow");
}
else
{
ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du bist nun nicht mehr Unshow");
}
}
#endregion Admin #endregion Admin
@@ -3901,10 +3906,16 @@ namespace ReallifeGamemode.Server.Commands
[RemoteEvent("Noclip")] [RemoteEvent("Noclip")]
public void Noclip(Player player) public void Noclip(Player player)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{ {
return; return;
} }
if (!player.IsTSupport())
{
ChatService.ErrorMessage(player, "Du bist nicht im T-Support");
return;
}
if (player.HasData("Adminduty") && player.GetData<bool>("Adminduty")) if (player.HasData("Adminduty") && player.GetData<bool>("Adminduty"))
player.TriggerEvent("ADMIN:NoClip"); player.TriggerEvent("ADMIN:NoClip");
} }