Merge branch 'develop' into 'master'

fix lc ga

See merge request log-gtav/reallife-gamemode!31
This commit is contained in:
hydrant
2021-04-03 21:38:47 +00:00

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;