h1z1-server 0.22.2-1 → 0.22.2-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.22.2-1",
+  "version": "0.22.2-2",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <quentingruber@gmail.com> (http://github.com/quentingruber)",
   "license": "GPL-3.0-only",

package/src/servers/ZoneServer2016/classes/zoneclient.ts

@@ -56,6 +56,7 @@ export class ZoneClient2016 {
   avgPingLen: number = 4;
   pingWarnings: number = 0;
   isWeaponLock: boolean = false;
+  avgPingReady: boolean = false;
   constructor(
     sessionId: number,
     soeClientId: string,
@@ -84,13 +85,20 @@ export class ZoneClient2016 {
     this.character = new Character2016(characterId, transientId);
   }
   addPing(ping: number) {
-    this.pings.push(ping);
+    if (ping > 0) {
+      this.pings.push(ping);
+    }
     if (this.pings.length > this.avgPingLen) {
       this.pings.shift();
     }
-    this.updateAvgPing();
+    if (this.pings.length === this.avgPingLen) {
+      this.updateAvgPing();
+    } else {
+      this.avgPingReady = false;
+    }
   }
   updateAvgPing() {
     this.avgPing = toInt(_.sum(this.pings) / this.pings.length);
+    this.avgPingReady = true;
   }
 }

package/src/servers/ZoneServer2016/commands/commands.ts

@@ -132,7 +132,11 @@ export const commands: Array<Command> = [
       const soeClient = server.getSoeClient(client.soeClientId);
       if (soeClient) {
         const stats = soeClient.getNetworkStats();
-        stats.push(`Ping: ${client.avgPing}ms`);
+        if (client.avgPingReady) {
+          stats.push(`Ping: ${client.avgPing}ms`);
+        } else {
+          stats.push(`Ping: estimates in progress`);
+        }
         for (let index = 0; index < stats.length; index++) {
           const stat = stats[index];
           server.sendChatText(client, stat, index == 0);

package/src/servers/ZoneServer2016/zonepackethandlers.ts

@@ -295,26 +295,28 @@ export class zonePacketHandlers {
     client: Client,
     packet: { data: GameTimeSync }
   ) {
-    const serverTime = Date.now();
-    const clientTime = Number(packet.data.time) * 1000;
-    const rawPing = serverTime - clientTime;
-    client.addPing(rawPing);
-    if (client.avgPing > server.maxPing) {
-      server.warnHighPing(client);
-    } else if (client.isWeaponLock && client.avgPing < server.maxPing) {
-      client.pingWarnings = 0;
-      server.unlockWeapon(client);
-    }
     server.sendGameTimeSync(client);
   }
   Synchronization(server: ZoneServer2016, client: Client, packet: any) {
+    const fullServerTime = Date.now();
     const serverTime = Int64String(Number((Date.now() / 1000).toFixed(0)));
     const reflectedPacket: Synchronization = {
       ...packet.data,
       serverTime: serverTime,
       serverTime2: serverTime,
-      time3: Int64String(Number(packet.data.clientTime) + 2),
+      time3: Int64String(Number(packet.data.clientTime)),
     };
+    const fullClientTimestamp =
+      Number(packet.data.clientTime) * 1000 +
+      Number(String(Number(packet.data.clientHoursMs)).slice(-3));
+    const rawPing = fullServerTime - fullClientTimestamp;
+    client.addPing(rawPing);
+    if (client.avgPing > server.maxPing) {
+      server.warnHighPing(client);
+    } else if (client.isWeaponLock && client.avgPing < server.maxPing) {
+      client.pingWarnings = 0;
+      server.unlockWeapon(client);
+    }
     server.sendData(client, "Synchronization", reflectedPacket);
   }
   CommandExecuteCommand(server: ZoneServer2016, client: Client, packet: any) {