Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Luke
2020-08-09 18:11:48 +02:00
5 changed files with 41 additions and 13 deletions

View File

@@ -1547,6 +1547,7 @@ namespace ReallifeGamemode.Server.Commands
}
ServerVehicle veh = VehicleManager.GetServerVehicleFromVehicle(targetVeh);
if (veh != null)
{
ChatService.ErrorMessage(player, "Dieses Fahrzeug wird von einem Server-System benutzt: ~m~" + veh.GetType().Name);

View File

@@ -9,11 +9,26 @@ using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Services;
namespace ReallifeGamemode.Server.Commands
{
internal class UserCommands : Script
{
[Command("id", "~m~Benutzung: ~s~/id")]
public void CmdUserId(Player player, String targetname)
{
Player target = PlayerService.GetPlayerByNameOrId(targetname);
if (target == null)
{
player.SendChatMessage("~c~Spieler ist nicht online.");
} else
{
player.SendChatMessage("~c~ID: (" + target.Id + ") " + target.Name);
}
}
[Command("dice", "~m~Benutzung: ~s~/dice")]
public void CmdUserDice(Player player)
{