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:
Lukas Moungos
2021-04-06 21:21:09 +02:00
parent 0390cb528e b0180baff3
commit 7b71dcfb89
13 changed files with 1956 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.Pools.GetAllPlayers().ForEach(p =>
{
User pUser = p.GetUser();
if (pUser.FactionLeader || pUser.IsAdmin(AdminLevel.ADMIN))
if ((pUser?.FactionLeader ?? false) || pUser.IsAdmin(AdminLevel.ADMIN))
{
ChatService.SendMessage(p, broadcastMsg);
}

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

@@ -108,6 +108,7 @@ namespace ReallifeGamemode.Server.Commands
{
player.StopAnimation();
player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable));
ChatService.SendInRange(player.Position, 20, $"~m~{player.Name} stellt sich...");
}
[Command("event", "~m~Benutzung: ~s~/event [Nachricht]", GreedyArg = true)]