aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/ga universell für alle GangOwned Fraktionen

Browse Source
This commit is contained in:
hydrant
2021-04-18 23:13:19 +02:00
parent c722c637bd
commit 4961c463b4
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,18 +48,17 @@ namespace ReallifeGamemode.Server.Commands
{
User user = player.GetUser();
Faction f = user?.Faction;
if ((f == null || f.StateOwned) && !user.IsAdmin(AdminLevel.ADMIN))
if ((f == null || !f.GangOwned) && !user.IsAdmin(AdminLevel.ADMIN))
{
ChatService.NotAuthorized(player);
return;
}
if (f?.Name == "Ballas" || f?.Name == "Grove" || user.IsAdmin(AdminLevel.ADMIN))
{
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
string rank = string.Empty;
if (f?.Name == "Ballas" || f?.Name == "Grove")
if (f?.GangOwned == true)
{
rank = player.GetUser().GetFactionRank().RankName;
}
@@ -74,11 +73,6 @@ namespace ReallifeGamemode.Server.Commands
ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.GangOwned), true);
}
}
else
{
return;
}
}
[Command("r", "~m~Benutzung: ~s~/r [Nachricht]", GreedyArg = true)]
public void CmdFactionR(Player player, string message)
@@ -356,7 +350,7 @@ namespace ReallifeGamemode.Server.Commands
public void CmdFactionMedicHealive(Player player, string receiver, int price = 10)
{
Player target = PlayerService.GetPlayerByNameOrId(receiver);
if(target == null || !target.IsLoggedIn())
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;