1 files changed, 15 insertions, 1 deletions
diff --git a/ShiftOS_TheReturn/ServerManager.cs b/ShiftOS_TheReturn/ServerManager.cs
index 0bdfcd9..792b38d 100644
--- a/ShiftOS_TheReturn/ServerManager.cs
+++ b/ShiftOS_TheReturn/ServerManager.cs
@@ -35,6 +35,7 @@ using ShiftOS;
 using static ShiftOS.Engine.SaveSystem;
 using Newtonsoft.Json;
 using System.Net.Sockets;
+using System.Diagnostics;
 
 namespace ShiftOS.Engine
 {
@@ -54,6 +55,12 @@ namespace ShiftOS.Engine
         private static NetObjectClient client { get; set; }
         private static bool UserDisconnect = false;
 
+        public static TimeSpan DigitalSocietyPing
+        {
+            get;
+            private set;
+        }
+
         public static void Disconnect()
         {
             UserDisconnect = true;
@@ -139,6 +146,11 @@ namespace ShiftOS.Engine
             };
             client.OnReceived += (o, a) =>
             {
+                if (PingTimer.IsRunning)
+                {
+                    DigitalSocietyPing = PingTimer.Elapsed;
+                    PingTimer.Reset();
+                }
                 var msg = a.Data.Object as ServerMessage;
                 if (msg.Name == "Welcome")
                 {
@@ -207,6 +219,8 @@ namespace ShiftOS.Engine
             }
         }
 
+        private static Stopwatch PingTimer = new Stopwatch();
+
         public static void SendMessage(string name, string contents)
         {
             var sMsg = new ServerMessage
@@ -215,7 +229,7 @@ namespace ShiftOS.Engine
                 Contents = contents,
                 GUID = thisGuid.ToString(),
             };
-
+            PingTimer.Start();
             client.Send(new NetObject("msg", sMsg));
 
         }