diff --git a/Application/Application.csproj b/Application/Application.csproj index b5ffe5727..376e41431 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -5,7 +5,7 @@ netcoreapp2.1 false RaidMax.IW4MAdmin.Application - 2.1.1 + 2.1.2 RaidMax Forever None IW4MAdmin @@ -75,7 +75,7 @@ - + diff --git a/Application/Server.cs b/Application/Server.cs index 3fc22e9cf..0d5a5b785 100644 --- a/Application/Server.cs +++ b/Application/Server.cs @@ -217,14 +217,17 @@ namespace IW4MAdmin if (currentBan.Type == Penalty.PenaltyType.TempBan) { - string formattedKick = String.Format(RconParser.GetCommandPrefixes().Kick, polledPlayer.ClientNumber, $"{loc["SERVER_TB_REMAIN"]} ({(currentBan.Expires - DateTime.UtcNow).TimeSpanText()} left)"); + string formattedKick = String.Format( + RconParser.GetCommandPrefixes().Kick, + polledPlayer.ClientNumber, + $"{loc["SERVER_TB_REMAIN"]} ({(currentBan.Expires - DateTime.UtcNow).TimeSpanText()} {loc["WEBFRONT_PENALTY_TEMPLATE_REMAINING"]})"); await this.ExecuteCommandAsync(formattedKick); } else - await player.Kick($"{loc["SERVER_BAN_PREV"]} {currentBan.Offense}", autoKickClient); + await player.Kick($"{loc["SERVER_BAN_PREV"]} {currentBan.Offense} ({loc["SERVER_BAN_APPEAL"]} {Website})", autoKickClient); if (player.Level != Player.Permission.Banned && currentBan.Type == Penalty.PenaltyType.Ban) - await player.Ban($"{loc["SERVER_BAN_PREV"]} {currentBan.Offense}", autoKickClient); + await player.Ban($"{currentBan.Offense}", autoKickClient); // they didn't fully connect so empty their slot Players[player.ClientNumber] = null; diff --git a/Plugins/Stats/Plugin.cs b/Plugins/Stats/Plugin.cs index 23f436cef..a6bb26326 100644 --- a/Plugins/Stats/Plugin.cs +++ b/Plugins/Stats/Plugin.cs @@ -46,7 +46,7 @@ namespace IW4MAdmin.Plugins.Stats await Manager.RemovePlayer(E.Origin); break; case GameEvent.EventType.Say: - if (!string.IsNullOrEmpty(E.Data) && + if (!string.IsNullOrEmpty(E.Data) && E.Origin.ClientId > 1) await Manager.AddMessageAsync(E.Origin.ClientId, E.Owner.GetHashCode(), E.Data); break; @@ -84,8 +84,8 @@ namespace IW4MAdmin.Plugins.Stats await Manager.AddStandardKill(E.Origin, E.Target); break; case GameEvent.EventType.Damage: - // if (!E.Owner.CustomCallback) - Manager.AddDamageEvent(E.Data, E.Origin.ClientId, E.Target.ClientId, E.Owner.GetHashCode()); + // if (!E.Owner.CustomCallback) + Manager.AddDamageEvent(E.Data, E.Origin.ClientId, E.Target.ClientId, E.Owner.GetHashCode()); break; case GameEvent.EventType.ScriptDamage: killInfo = (E.Data != null) ? E.Data.Split(';') : new string[0]; @@ -113,7 +113,6 @@ namespace IW4MAdmin.Plugins.Stats Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_TOP_TEXT"], "/Stats/TopPlayersAsync"); - // meta data info async Task> getStats(int clientId) { @@ -169,7 +168,6 @@ namespace IW4MAdmin.Plugins.Stats double chestAbdomenRatio = 0; double hitOffsetAverage = 0; double maxStrain = clientStats.Count(c => c.MaxStrain > 0) == 0 ? 0 : clientStats.Max(cs => cs.MaxStrain); - //double maxAngle = clientStats.Max(cs => cs.HitLocations.Max(hl => hl.MaxAngleDistance)); if (clientStats.Where(cs => cs.HitLocations.Count > 0).FirstOrDefault() != null) { @@ -231,12 +229,6 @@ namespace IW4MAdmin.Plugins.Stats Value = Math.Round(maxStrain, 3), Sensitive = true }, - /*new ProfileMeta() - { - Key = "Max Angle Distance", - Value = Math.Round(maxAngle, 1), - Sensitive = true - }*/ }; }