Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fix tag on welcome issue

Browse Source
This commit is contained in:
RaidMax 2022-07-08 20:39:58 -05:00
parent 88e67747fe
commit 052eeb0615
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Application/IW4MServer.cs
View File

@ -373,9 +373,9 @@ namespace IW4MAdmin
var clientTag = await _metaService.GetPersistentMetaByLookup(EFMeta.ClientTagV2, var clientTag = await _metaService.GetPersistentMetaByLookup(EFMeta.ClientTagV2,
EFMeta.ClientTagNameV2, E.Origin.ClientId, Manager.CancellationToken); EFMeta.ClientTagNameV2, E.Origin.ClientId, Manager.CancellationToken);
if (clientTag?.LinkedMeta != null) if (clientTag.Value != null)
{ {
E.Origin.Tag = clientTag.LinkedMeta.Value; E.Origin.Tag = clientTag.Value;
} }
try try

6
Plugins/Welcome/Plugin.cs
View File

@ -53,7 +53,7 @@ namespace IW4MAdmin.Plugins.Welcome
{ {
var newPlayer = gameEvent.Origin; var newPlayer = gameEvent.Origin;
if (newPlayer.Level >= Permission.Trusted && !gameEvent.Origin.Masked|| if (newPlayer.Level >= Permission.Trusted && !gameEvent.Origin.Masked||
!string.IsNullOrEmpty(newPlayer.GetAdditionalProperty<string>("ClientTag")) && !string.IsNullOrEmpty(newPlayer.Tag) &&
newPlayer.Level != Permission.Flagged && newPlayer.Level != Permission.Banned && newPlayer.Level != Permission.Flagged && newPlayer.Level != Permission.Banned &&
!newPlayer.Masked) !newPlayer.Masked)
gameEvent.Owner.Broadcast( gameEvent.Owner.Broadcast(
@ -88,7 +88,7 @@ namespace IW4MAdmin.Plugins.Welcome
{ {
msg = msg.Replace("{{ClientName}}", joining.Name); msg = msg.Replace("{{ClientName}}", joining.Name);
msg = msg.Replace("{{ClientLevel}}", msg = msg.Replace("{{ClientLevel}}",
$"{Utilities.ConvertLevelToColor(joining.Level, joining.ClientPermission.Name)}{(string.IsNullOrEmpty(joining.GetAdditionalProperty<string>("ClientTag")) ? "" : $" (Color::White)({joining.GetAdditionalProperty<string>("ClientTag")}(Color::White))")}"); $"{Utilities.ConvertLevelToColor(joining.Level, joining.ClientPermission.Name)}{(string.IsNullOrEmpty(joining.Tag) ? "" : $" (Color::White){joining.Tag}(Color::White)")}");
// this prevents it from trying to evaluate it every message // this prevents it from trying to evaluate it every message
if (msg.Contains("{{ClientLocation}}")) if (msg.Contains("{{ClientLocation}}"))
{ {
@ -111,7 +111,7 @@ namespace IW4MAdmin.Plugins.Welcome
try try
{ {
var response = var response =
await wc.GetStringAsync(new Uri($"http://ip-api.com/json/{ip}")); await wc.GetStringAsync(new Uri($"http://ip-api.com/json/{ip}?lang={Utilities.CurrentLocalization.LocalizationName.Split("-").First().ToLower()}"));
var responseObj = JObject.Parse(response); var responseObj = JObject.Parse(response);
response = responseObj["country"]?.ToString(); response = responseObj["country"]?.ToString();