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)]

5
ReallifeGamemode.Server/Managers/BusinessManager.cs
View File

@@ -129,6 +129,11 @@ namespace ReallifeGamemode.Server.Managers
[ServerEvent(Event.PlayerEnterVehicle)]
public void CarDealerBusiness_PlayerEnterVehicle(Player player, Vehicle veh, int seat)
{
if(player.IsAdminDuty())
{
return;
}
ServerVehicle sVeh = veh.GetServerVehicle();
if (sVeh == null) return;
if (!(sVeh is ShopVehicle)) return;

14
ReallifeGamemode.Server/Services/ChatService.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
@@ -115,6 +116,17 @@ namespace ReallifeGamemode.Server.Services
});
}
internal static void SendInRange(Vector3 position, int range, string message)
{
foreach(Player player in NAPI.Pools.GetAllPlayers())
{
if(player.Position.DistanceTo(position) <= range)
{
SendMessage(player, message);
}
}
}
public static void BroadcastGroup(string message, Group group)
{
message = $"!{{FF8080}}** Gruppe: {message}";