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

Merge confligt resolve

Browse Source
This commit is contained in:
VegaZ
2018-10-15 17:09:31 +02:00
parent acd68f0e2d 679a72902f
commit 85037eddca
1 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Server/Commands/Admin.cs
View File

@@ -25,6 +25,49 @@ namespace reallife_gamemode.Server.Commands
{
public class Admin : Script
{
[Command("vmod", "~m~Benutzung: ~s~/vmod [Slot] [Mod ID]")]
public void CmdAdminVmod(Client player, int slot, int mod)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
if (!player.IsInVehicle)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug.");
return;
}
if (mod == -1) player.Vehicle.RemoveMod(slot);
else player.Vehicle.SetMod(slot, mod);
}
[Command("clothes", "~m~Benutzung: ~s~/clothes [Slot] [Component ID] (Textur)")]
public void CmdAdminClothes(Client player, int slot, int component, int texture = 0)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
player.SetClothes(slot, component, texture);
}
[Command("props", "~m~Benutzung: ~s~/props [Slot] [Component ID] (Textur)")]
public void CmdAdminProps(Client player, int slot, int component, int texture = 0)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
player.SetAccessories(slot, component, texture);
}
[Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)]
public void CmdAdminO(Client player, string message)
{
@@ -325,7 +368,7 @@ namespace reallife_gamemode.Server.Commands
player.SendChatMessage("Farb-ID1 " + color1 + ", Farb-ID2 " + color2 + "");
}
[Command("aw", "~m~Benutzung: ~s~/aw [Spieler] [Nachricht]")]
[Command("aw", "~m~Benutzung: ~s~/aw [Spieler] [Nachricht]", GreedyArg = true)]
public void CmdAdminMsg(Client player, string name, string msg)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -599,13 +642,9 @@ namespace reallife_gamemode.Server.Commands
if (player.IsInVehicle)
{
Vehicle vehicle = player.Vehicle;
<<<<<<< HEAD
SaveManager.SaveVehicleData((VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, vehicle.EngineStatus, Convert.ToByte(vehicle.Dimension));
=======
SaveData.SaveVehicleData((VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, Convert.ToByte(vehicle.Dimension));
>>>>>>> feature/client-player-keys
}
else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
break;
@@ -777,7 +816,7 @@ namespace reallife_gamemode.Server.Commands
else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
}
[Command("a", "~m~Benutzung: ~s~/a [Nachricht]")]
[Command("a", "~m~Benutzung: ~s~/a [Nachricht]", GreedyArg = true)]
public void CmdAdminA(Client player, string message)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -1095,6 +1134,25 @@ namespace reallife_gamemode.Server.Commands
}
//TODO TEST COMMAND
[Command("aspeed", "~m~Benutzung: ~s~/aspeed [Modifier]")]
public void CmdAdminAspeed(Client player, float modifier)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
if (!player.IsInVehicle)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug.");
return;
}
player.Vehicle.EnginePowerMultiplier = modifier;
}
//TEST COMMAND
[Command("myvehicles")]
public void CmdAdminMyVehicles(Client player)
{