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

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

Browse Source
This commit is contained in:
VegaZ
2021-04-04 00:00:22 +02:00
parent 967ff86006 a346ae97c3
commit 7be17e0c3b
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
User user = player.GetUser(); User user = player.GetUser();
Faction f = user?.Faction; Faction f = user?.Faction;
if (f == null || f.StateOwned) if ((f == null || f.StateOwned) && !user.IsAdmin(AdminLevel.ADMIN))
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
@@ -180,7 +180,7 @@ namespace ReallifeGamemode.Server.Commands
public void CmdFactionLc(Player player, string message) public void CmdFactionLc(Player player, string message)
{ {
User user = player.GetUser(); 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); ChatService.NotAuthorized(player);
return; return;

1
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -103,6 +103,7 @@ namespace ReallifeGamemode.Server.Commands
[Command("hup")] [Command("hup")]
public void CmdAnim(Player player) public void CmdAnim(Player player)
{ {
player.StopAnimation();
player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable)); player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable));
} }

10
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -795,20 +795,20 @@ namespace ReallifeGamemode.Server.Managers
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers(); List<Player> players = NAPI.Pools.GetAllPlayers();
if (player.GetUser().Wanteds > 0)
{
var listPlayers = players.Select(p => new var listPlayers = players.Select(p => new
{ {
Id = p.Handle.Value, Id = p.Handle.Value,
p.Name, p.Name,
wanted = p.GetUser().Wanteds, wanted = p.GetUser().Wanteds,
}) ; }) ;
if(listPlayers.Count() > 0)
player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers)); player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));
}
else else
{
player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!"); player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!");
}
} }
[RemoteEvent("CLIENT:InteractionMenu_FindHouse")] [RemoteEvent("CLIENT:InteractionMenu_FindHouse")]