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:
kookroach
2021-04-03 23:41:46 +02:00
parent 5c8523a313 a03b924a96
commit fbaa1c2900
2 changed files with 3 additions and 3 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;

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

@@ -57,7 +57,7 @@ namespace ReallifeGamemode.Server.Services
foreach (Player c in NAPI.Pools.GetAllPlayers()) foreach (Player c in NAPI.Pools.GetAllPlayers())
{ {
User user = c.GetUser(); User user = c.GetUser();
Faction f = user.Faction; Faction f = user?.Faction;
if (f != null) if (f != null)
{ {
if (factions.Find(fT => fT.Id == f.Id) != null) if (factions.Find(fT => fT.Id == f.Id) != null)