diff --git a/ReallifeGamemode.Server/Gangwar/Gangwar.cs b/ReallifeGamemode.Server/Gangwar/Gangwar.cs index 35a5778f..2f03c031 100644 --- a/ReallifeGamemode.Server/Gangwar/Gangwar.cs +++ b/ReallifeGamemode.Server/Gangwar/Gangwar.cs @@ -186,7 +186,13 @@ namespace ReallifeGamemode.Server.Gangwar [RemoteEvent("SERVER:StartGangwar")] public void RmtEvent_StartGangwar(Player client) { - if (!client.GetUser().FactionLeader) + User user = client.GetUser(); + if(user == null || user.Faction == null) + { + return; + } + + if (!user.FactionLeader) return; foreach (var turf in getTurfs()) @@ -197,7 +203,7 @@ namespace ReallifeGamemode.Server.Gangwar return; } } - if (client.GetUser().Faction.Name == "Ballas" || client.GetUser().Faction.Name == "Grove") + if (user.Faction.GangOwned) { foreach (var turf in getTurfs()) { @@ -205,8 +211,11 @@ namespace ReallifeGamemode.Server.Gangwar { if (u == client) { - if (turf.Owner != client.GetUser().Faction.Name) - turf.attack(client.GetUser().Faction.Name); + if (turf.Owner != user.Faction.Name) + { + turf.attack(user.Faction.Name); + break; + } } } }