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

Improved color code prohibition

Browse Source
This commit is contained in:
hydrant
2018-12-03 18:37:11 +01:00
parent bcf6c2b8ff
commit 91eddfc580
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Server/Commands/Admin.cs
View File

@@ -38,7 +38,7 @@ namespace reallife_gamemode.Server.Commands
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
} }
message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
message = Regex.Replace(message, "#([0-9A-Fa-f]{6})", m => "!{" + m.Groups[0].Value + "}"); message = Regex.Replace(message, "#([0-9A-Fa-f]{6})", m => "!{" + m.Groups[0].Value + "}");
string publicMessage = "~b~(( " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + message + " ~b~))"; string publicMessage = "~b~(( " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + message + " ~b~))";
@@ -154,7 +154,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
msg = Regex.Replace(msg, "(!{(.*)})", ""); msg = Regex.Replace(msg, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
player.SendChatMessage("~y~PM an " + target.Name + ": " + msg + " "); player.SendChatMessage("~y~PM an " + target.Name + ": " + msg + " ");
string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg + ""; string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg + "";
@@ -208,7 +208,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
message = Regex.Replace(message, "(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
ChatService.BroadcastAdmin("~r~[ADMINCHAT]~s~ " + player.GetUser().AdminLevel.GetName() + " " + player.Name + "~w~: " + message, AdminLevel.ADMIN); ChatService.BroadcastAdmin("~r~[ADMINCHAT]~s~ " + player.GetUser().AdminLevel.GetName() + " " + player.Name + "~w~: " + message, AdminLevel.ADMIN);
} }
@@ -512,7 +512,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
reason = Regex.Replace(reason, "(!{(.*)})", ""); reason = Regex.Replace(reason, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
target.GetUser().BanPlayer(admin, reason, mins); target.GetUser().BanPlayer(admin, reason, mins);
} }

10
Server/Commands/Faction.cs
View File

@@ -33,7 +33,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
message = Regex.Replace(message, "(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
string broadcastMessage = "!{02FCFF}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + " )) **"; string broadcastMessage = "!{02FCFF}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + " )) **";
ChatService.BroadcastFaction(broadcastMessage, f); ChatService.BroadcastFaction(broadcastMessage, f);
@@ -49,7 +49,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
message = Regex.Replace(message, "(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
string broadcastMessage = "!{33AA33}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + ", over **"; string broadcastMessage = "!{33AA33}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + ", over **";
ChatService.BroadcastFaction(broadcastMessage, f); ChatService.BroadcastFaction(broadcastMessage, f);
@@ -65,7 +65,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
message = Regex.Replace(message, "(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
string broadcastMessage = "!{CC3333}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + ", over **"; string broadcastMessage = "!{CC3333}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + ", over **";
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
@@ -203,7 +203,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
message = Regex.Replace(message, "(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
string broadcastMsg = "~y~[" + player.GetUser().GetFaction().Name + "] " + player.Name + ": " + message; string broadcastMsg = "~y~[" + player.GetUser().GetFaction().Name + "] " + player.Name + ": " + message;
@@ -264,7 +264,7 @@ namespace reallife_gamemode.Server.Commands
player.SendNotification("Du hast~g~" + target.Name + " ~s~geheilt.", false); player.SendNotification("Du hast~g~" + target.Name + " ~s~geheilt.", false);
} }
#endregion #endregion
#region Global Fraktions Commands #region Global Fraktions Commands
[Command("duty", "~m~Benutzung: ~s~/duty")] [Command("duty", "~m~Benutzung: ~s~/duty")]
public void CmdFactionDuty(Client player) public void CmdFactionDuty(Client player)
{ {

2
Server/Events/Chat.cs
View File

@@ -8,7 +8,7 @@ namespace reallife_gamemode.Server.Events
[ServerEvent(Event.ChatMessage)] [ServerEvent(Event.ChatMessage)]
public void ChatEvent(Client player, string message) public void ChatEvent(Client player, string message)
{ {
string serverMsg = Regex.Replace(message, "(!{(.*)})", ""); string serverMsg = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
if (serverMsg.Trim().Length == 0) return; if (serverMsg.Trim().Length == 0) return;
NAPI.Player.GetPlayersInRadiusOfPlayer(10, player).ForEach(p => p.SendChatMessage($"{player.Name} sagt: {serverMsg}")); NAPI.Player.GetPlayersInRadiusOfPlayer(10, player).ForEach(p => p.SendChatMessage($"{player.Name} sagt: {serverMsg}"));
} }