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

admin lc ga

Browse Source
This commit is contained in:
hydrant
2021-04-04 23:08:06 +02:00
parent eb1eebe123
commit 4041983d53
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,18 @@ namespace ReallifeGamemode.Server.Commands
{ {
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
string broadcastMessage = "!{FF0000}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + " **"; string rank = string.Empty;
if(f.Name == "Ballas" || f.Name == "Grove")
{
rank = player.GetUser().GetFactionRank().RankName;
}
else
{
rank = "[ADMIN]";
}
string broadcastMessage = "!{FF0000}** " + rank + " " + player.Name + ": " + message + " **";
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
{ {
ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.GangOwned), true); ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.GangOwned), true);
@@ -188,12 +199,25 @@ namespace ReallifeGamemode.Server.Commands
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
string broadcastMsg = "~y~[" + player.GetUser().Faction.Name + "] " + player.Name + ": " + message; string factionName = string.Empty;
if(user.FactionLeader)
{
factionName = player.GetUser().Faction.Name;
}
else
{
factionName = "ADMIN";
}
string broadcastMsg = "~y~[" + factionName + "] " + player.Name + ": " + message;
NAPI.Pools.GetAllPlayers().ForEach(p => NAPI.Pools.GetAllPlayers().ForEach(p =>
{ {
User pUser = p.GetUser(); User pUser = p.GetUser();
if (pUser?.FactionLeader ?? false || pUser.IsAdmin(AdminLevel.ADMIN)) ChatService.SendMessage(p, broadcastMsg); if (pUser.FactionLeader || pUser.IsAdmin(AdminLevel.ADMIN))
{
ChatService.SendMessage(p, broadcastMsg);
}
}); });
} }

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

@@ -58,12 +58,9 @@ namespace ReallifeGamemode.Server.Services
{ {
User user = c.GetUser(); User user = c.GetUser();
Faction f = user?.Faction; Faction f = user?.Faction;
if (f != null) if (f != null && factions.Find(fT => fT.Id == f.Id) != null)
{ {
if (factions.Find(fT => fT.Id == f.Id) != null) ChatService.SendMessage(c, message);
{
ChatService.SendMessage(c, message);
}
} }
else if (user.IsAdmin(AdminLevel.ADMIN) && toAdmins) else if (user.IsAdmin(AdminLevel.ADMIN) && toAdmins)
{ {