Add simple ping toleration to murder player check

serverflex · Apr 11, 2021 · f43577b · f43577b
1 parent a56eed2
commit f43577b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/Impostor.Api/Net/IHazelConnection.cs b/src/Impostor.Api/Net/IHazelConnection.cs
@@ -24,6 +24,11 @@ public interface IHazelConnection
         /// </summary>
         IClient? Client { get; set; }
 
+        /// <summary>
+        ///     Gets the average ping of the client.
+        /// </summary>
+        float AveragePing { get; }
+
         /// <summary>
         ///     Sends a message writer to the connection.
         /// </summary>

diff --git a/src/Impostor.Server/Net/Hazel/HazelConnection.cs b/src/Impostor.Server/Net/Hazel/HazelConnection.cs
@@ -27,6 +27,8 @@ public HazelConnection(Connection innerConnection, ILogger<HazelConnection> logg
 
         public IClient? Client { get; set; }
 
+        public float AveragePing => InnerConnection is NetworkConnection networkConnection ? networkConnection.AveragePingMs : 0;
+
         public ValueTask SendAsync(IMessageWriter writer)
         {
             return InnerConnection.SendAsync(writer);

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
@@ -544,7 +544,7 @@ private async ValueTask<bool> HandleMurderPlayer(ClientPlayer sender, IInnerPlay
                 }
             }
 
-            PlayerInfo.LastMurder = _dateTimeProvider.UtcNow;
+            PlayerInfo.LastMurder = _dateTimeProvider.UtcNow - TimeSpan.FromMilliseconds(sender.Client.Connection.AveragePing);
 
             if (target != null && !target.PlayerInfo.IsDead)
             {

diff --git a/src/Impostor.Tools.ServerReplay/Mocks/MockHazelConnection.cs b/src/Impostor.Tools.ServerReplay/Mocks/MockHazelConnection.cs
@@ -17,6 +17,7 @@ public MockHazelConnection(IPEndPoint endPoint)
         public IPEndPoint EndPoint { get; }
         public bool IsConnected { get; }
         public IClient Client { get; set; }
+        public float AveragePing => 0;
 
         public ValueTask SendAsync(IMessageWriter writer)
         {
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
-                PlayerInfo.LastMurder = _dateTimeProvider.UtcNow;
+                PlayerInfo.LastMurder = _dateTimeProvider.UtcNow - TimeSpan.FromMilliseconds(sender.Client.Connection.AveragePing);
                 if (target != null && !target.PlayerInfo.IsDead)
                 {
@@ Expand Down @@