diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index c5668041..dffffd3d 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Commands { User user = player.GetUser(); Faction f = user?.Faction; - if (f == null || f.StateOwned) + if ((f == null || f.StateOwned) && !user.IsAdmin(AdminLevel.ADMIN)) { ChatService.NotAuthorized(player); return; @@ -180,7 +180,7 @@ namespace ReallifeGamemode.Server.Commands public void CmdFactionLc(Player player, string message) { User user = player.GetUser(); - if (user?.FactionId == null || user.FactionLeader == false || !user.IsAdmin(AdminLevel.ADMIN)) + if ((user?.FactionId == null || user.FactionLeader == false) && !user.IsAdmin(AdminLevel.ADMIN)) { ChatService.NotAuthorized(player); return; diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index 18f78cb2..5cf6dd91 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -103,6 +103,7 @@ namespace ReallifeGamemode.Server.Commands [Command("hup")] public void CmdAnim(Player player) { + player.StopAnimation(); player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable)); } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 45cda73d..ae4656a1 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -795,20 +795,20 @@ namespace ReallifeGamemode.Server.Managers { if (!player.IsLoggedIn()) return; List players = NAPI.Pools.GetAllPlayers(); - if (player.GetUser().Wanteds > 0) - { + var listPlayers = players.Select(p => new { Id = p.Handle.Value, p.Name, wanted = p.GetUser().Wanteds, }) ; - player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers)); - } - else - { - player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!"); - } + + if(listPlayers.Count() > 0) + player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers)); + else + player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!"); + + } [RemoteEvent("CLIENT:InteractionMenu_FindHouse")]