Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

This commit is contained in:
xSprite
2018-09-24 23:11:50 +02:00

View File

@@ -603,13 +603,13 @@ namespace reallife_gamemode.Server.Commands
[Command("setweather", "~m~Benutzung: ~s~/setweather [WEATHER]")] [Command("setweather", "~m~Benutzung: ~s~/setweather [WEATHER]")]
public void CmdAdminSetweather(Client player, string weather) public void CmdAdminSetweather(Client player, string weather)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
} }
Weather weatherBefore = NAPI.World.GetWeather(); Weather weatherBefore = NAPI.World.GetWeather();
NAPI.World.SetWeather(weather); NAPI.World.SetWeather(weather);
Weather weatherAfter = NAPI.World.GetWeather(); Weather weatherAfter = NAPI.World.GetWeather();
@@ -792,5 +792,24 @@ namespace reallife_gamemode.Server.Commands
player.Position = playerPosition; player.Position = playerPosition;
} }
} }
[Command("ip", "~m~Benutzung: ~s~/ip [Spieler]")]
public void CmdAdminIp(Client player, string targetname)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
{
ChatService.PlayerNotFound(target);
return;
}
player.SendChatMessage("IP von " + NAPI.Player.GetPlayerName(target) + ": " + target.Address);
}
} }
} }