h1z1-server 0.25.3-2 → 0.25.3-3

package/data/2016/encryptedData/encryptedData.json

@@ -1,66 +1,82 @@
 [
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "947e47e8df9e2f731162884274e4e3d1"
+    "iv": "429c41f782a4d10b56ac43b15e132cc1",
+    "encryptedData": "e88beddbf046bade585cb40c035205fb"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "4954430770cb8335663b2c7603905a9b"
+    "iv": "6f0f727b3edda3a59a7d3d699c6c7589",
+    "encryptedData": "541a6af0c674ab59380bfd027d769106"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "dd4b5855c9051fa0df4568217ed32a33"
+    "iv": "506bb383cdccb4d51024f2998bbda954",
+    "encryptedData": "de22e03e2c2a2fd98a592d397868c62f"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "59703a77bfcc16fd80bfd66bb227a3e3"
+    "iv": "96a78494d3aa57af1390afff6a5d9eaa",
+    "encryptedData": "071327955655cf3872ac053e91d8f1d7"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "d13c8ffed1f28b19dc8333a99e09200d"
+    "iv": "b9f210042e832170423bfa45e713a864",
+    "encryptedData": "d607e166aa33267fe1e1e2db1df01df7"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "2616f54828387e0fb0d92c6689a8a9cf"
+    "iv": "cf623230e05783c4432d67e995cf0d03",
+    "encryptedData": "e1131f1626db1329b56078e33b8f73f1"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "6153f99f87d648497b06ab6d2e934860"
+    "iv": "8f1937225a6a4b451bba1842d4e93a99",
+    "encryptedData": "863ad9d53332e1345489579242d8a177"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "bf05833bb819c4ae1fbb1fb2293e3b51"
+    "iv": "60b523205541eaf0394ac5ded898484e",
+    "encryptedData": "5e2e649d2e2db8c892c2e9bf43a21d1d"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "ab69bf026aa0feafb6df1e27d80f3707"
+    "iv": "0952a634abe5a4bcbf6f6965b2d7e94a",
+    "encryptedData": "14c5e55691110fbc5199f05b77a63800"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "0722c7b737c42ad953a7389bd95aaf0f"
+    "iv": "50a68da557a2a8f5e2e4e24553d90c1f",
+    "encryptedData": "78064ed318a8ffaa5f3c3a5f2cd66ab2"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "46fef4dab38ea5f2442b840e3dc007bb"
+    "iv": "a638bcb701d22edcd2b6eebbca1f43f9",
+    "encryptedData": "aae666d3c587d68862b533fe07aeec84"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "4e6f01bad798b569e1dae68676d8cefd"
+    "iv": "965f8d8157a468c6614b10a35017c2b5",
+    "encryptedData": "fda0df98eea883ecfcc31a1cdf5237f4"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "1f562e064e059540d0a0aa42ae19284c"
+    "iv": "46dad3078c80081f5f855f2a6571cca9",
+    "encryptedData": "9033abad2bb2d845510ddff1a9ca0168"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "e65f9a873a07982e3b257a00fd3c7aa4620fea877b7eedf5dcb2e0745530667d"
+    "iv": "af02c554aaa00b0b90f938d730085da0",
+    "encryptedData": "f08c72ee146cba26ff8078b66735a4f0384a1d334b86ee57fd790c139b7b635c"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "8085c4bbdf7e82eb5988a67d81f6c348"
+    "iv": "65f61c9fc78dc39f5a44f636257808db",
+    "encryptedData": "5008546353f1f2683aab4b66c0314f02"
   },
   {
-    "iv": "9bdd2548821a980912fab12c9aef9c5c",
-    "encryptedData": "0c79c3c3203083bb993840b74b91a09571a7d95cf9286db439e46fad5c212ac3"
+    "iv": "f67a53aa22ea38fea4fdf575426137b3",
+    "encryptedData": "2f0cdbb3a1a4f794431f74eaea9413ab015430c23803cc3b5cfd61af01f23357"
+  },
+  {
+    "iv": "bc3fb49739d5a50bb67e3368220544ad",
+    "encryptedData": "27437bf6e73172025a1509c54a6f4226b324310c8ac5e551597a934bd83eb9cd02a81d790df3a4c24cf4fe031283d6d8"
+  },
+  {
+    "iv": "56900d8fd6d729f6727cc2b89b8c0a1b",
+    "encryptedData": "8c11e5c29e1d59f578b82d5964753f77d071eee113730686072ae961c588dff6"
+  },
+  {
+    "iv": "45053b47f1b740b82ca6c262960c8baf",
+    "encryptedData": "dcf5028d95e69ead7ad58ea38613842a71ab3beb997c785722162ba337ebe4d4421e4c303f5478e8761a3f5978fc8cc4693478b42db090630c1542fed8291c0394cb5f552f6ca8ebc03ffdfd9b54bc46"
+  },
+  {
+    "iv": "305ac9717ec834c8bbeb2b24c6a1a897",
+    "encryptedData": "95481274f36bf3102d25115b3db8fc3ae1bc57ee2b7e2391fbb4c909f5dd409d29f36d49a73e3c1de3181a2ea6adc14c1fb718a8e017056ecced9a396bd8d449095cabd370b11ff03673d9868462f618"
   }
 ]

package/data/2016/sampleData/stats.json

@@ -288,7 +288,7 @@
             "statValue": {
                 "type": 1,
                 "value": {
-                    "base": 0.4,
+                    "base": 0.6,
                     "modifier": 0
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.25.3-2",
+  "version": "0.25.3-3",
   "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

@@ -28,6 +28,7 @@ export class ZoneClient2016 {
   firstLoading: boolean = false;
   isLoading: boolean = true;
   characterReleased: boolean = false;
+  isSynced: boolean = false;
   isInteracting: boolean = false;
   isAdmin: boolean = false;
   isDebugMode: boolean = false;

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

@@ -1482,11 +1482,9 @@ export const commands: Array<Command> = [
         `Players: ${Object.values(server._clients)
           .map((c) => {
             return `${c.character.name}: ${c.loginSessionId} | ${
-              server.getSoeClient(client.soeClientId)?.getNetworkStats()[2]
-            } | ${
-              server.getSoeClient(client.soeClientId)?.getNetworkStats()[0]
-            } | ${
-              server.getSoeClient(client.soeClientId)?.getNetworkStats()[1]
+              server.getSoeClient(c.soeClientId)?.getNetworkStats()[2]
+            } | ${server.getSoeClient(c.soeClientId)?.getNetworkStats()[0]} | ${
+              server.getSoeClient(c.soeClientId)?.getNetworkStats()[1]
             }`;
           })
           .join(",\n")}`

package/src/servers/ZoneServer2016/entities/character.ts

@@ -106,6 +106,7 @@ export class Character2016 extends BaseFullCharacter {
   spawnGridData: number[] = [];
   lastJumpTime: number = 0;
   weaponStance: number = 1;
+  stance: number = 0;
   readonly metrics: CharacterMetrics = {
     recipesDiscovered: 0,
     zombiesKilled: 0,
@@ -202,11 +203,11 @@ export class Character2016 extends BaseFullCharacter {
           (client.vehicle.mountedVehicle == "" ||
             !client.vehicle.mountedVehicle)
         ) {
-          client.character._resources[ResourceIds.STAMINA] -= 4;
+          client.character._resources[ResourceIds.STAMINA] -= 8;
           client.character.isExhausted =
             client.character._resources[ResourceIds.STAMINA] < 120;
         } else if (!client.character.isBleeding || !client.character.isMoving) {
-          client.character._resources[ResourceIds.STAMINA] += 12;
+          client.character._resources[ResourceIds.STAMINA] += 16;
         }
 
         // todo: modify sprint stat

package/src/servers/ZoneServer2016/zonepackethandlers.ts

@@ -165,11 +165,6 @@ export class zonePacketHandlers {
         });
       });
 
-      server.sendData(client, "Synchronization", {
-        serverTime: Int64String(server.getServerTime()),
-        serverTime2: Int64String(server.getServerTime()),
-      } as Synchronization);
-
       server.sendData(client, "Character.WeaponStance", {
         // activates weaponstance key
         characterId: client.character.characterId,
@@ -380,7 +375,7 @@ export class zonePacketHandlers {
     });
   }
   KeepAlive(server: ZoneServer2016, client: Client, packet: any) {
-    if (client.isLoading && client.characterReleased) {
+    if (client.isLoading && client.characterReleased && client.isSynced) {
       setTimeout(() => {
         client.isLoading = false;
         if (!client.characterReleased) return;
@@ -404,7 +399,9 @@ export class zonePacketHandlers {
       const obj = { log: packet.data.message, isSuspicious: false };
       for (let x = 0; x < server._suspiciousList.length; x++) {
         if (
-          packet.data.message.toLowerCase().includes(server._suspiciousList[x])
+          packet.data.message
+            .toLowerCase()
+            .includes(server._suspiciousList[x].toLowerCase())
         ) {
           obj.isSuspicious = true;
           if (!server._soloMode) {
@@ -497,6 +494,10 @@ export class zonePacketHandlers {
       time3: Int64String(Number(packet.data.clientTime)) + 2,
     };
     server.sendData(client, "Synchronization", reflectedPacket);
+    if (client.isSynced) return;
+    client.isSynced = true;
+    client.character.lastLoginDate = toHex(Date.now());
+    server.constructionManager(client);
   }
   CommandExecuteCommand(server: ZoneServer2016, client: Client, packet: any) {
     this.commandHandler.executeCommand(server, client, packet);
@@ -628,7 +629,7 @@ export class zonePacketHandlers {
       return;
     }
     // for cheaters spawning cars on top of peoples heads
-    if (client.vehicle.mountedVehicle != vehicle.characterId) return;
+    if (!client.managedObjects.includes(vehicle.characterId)) return;
     if (packet.data.positionUpdate.position) {
       if (
         server.vehicleSpeedFairPlayCheck(
@@ -654,13 +655,18 @@ export class zonePacketHandlers {
         ) > 100
       ) {
         kick = true;
+        server.kickPlayer(client);
+        server.sendChatTextToAdmins(
+          `FairPlay: kicking ${client.character.name} for suspeced teleport in vehicle by ${dist} from [${vehicle.positionUpdate.position[0]} ${vehicle.positionUpdate.position[1]} ${vehicle.positionUpdate.position[2]}] to [${packet.data.positionUpdate.position[0]} ${packet.data.positionUpdate.position[1]} ${packet.data.positionUpdate.position[2]}]`,
+          false
+        );
       }
       vehicle.getPassengerList().forEach((passenger: string) => {
         if (server._characters[passenger]) {
           if (kick) {
             const c = server.getClientByCharId(passenger);
             if (!c) return;
-            server.kickPlayer(client);
+            server.kickPlayer(c);
             server.sendChatTextToAdmins(
               `FairPlay: kicking ${c.character.name} for suspeced teleport in vehicle by ${dist} from [${vehicle.positionUpdate.position[0]} ${vehicle.positionUpdate.position[1]} ${vehicle.positionUpdate.position[2]}] to [${packet.data.positionUpdate.position[0]} ${packet.data.positionUpdate.position[1]} ${packet.data.positionUpdate.position[2]}]`,
               false
@@ -778,6 +784,20 @@ export class zonePacketHandlers {
           triggerLoadingScreen: true,
         });
       }
+      // disabled for now
+      /*if (packet.data.stance & (1 << 1)) {
+        // started crouching
+        client.character._resources[ResourceIds.STAMINA] -= 12; // 2% stamina jump penalty
+        if (client.character._resources[ResourceIds.STAMINA] < 0)
+          client.character._resources[ResourceIds.STAMINA] = 0;
+        server.updateResourceToAllWithSpawnedEntity(
+          client.character.characterId,
+          client.character._resources[ResourceIds.STAMINA],
+          ResourceIds.STAMINA,
+          ResourceTypes.STAMINA,
+          server._characters
+        );
+      }*/
       const byte1 = packet.data.stance & 0xff;
       client.character.isRunning = !!(byte1 & (1 << 2)) ? true : false;
       if (
@@ -798,6 +818,7 @@ export class zonePacketHandlers {
           server._characters
         );
       }
+      client.character.stance = packet.data.stance;
     }
     const movingCharacter = server._characters[client.character.characterId];
     if (movingCharacter) {
@@ -1946,7 +1967,7 @@ export class zonePacketHandlers {
             weaponItem.weapon.ammoCount -= 1;
           }
           const drift = Math.abs(p.gameTime - server.getServerTime());
-          if (drift > 500) {
+          if (drift > server._maxPing) {
             server.sendChatText(
               client,
               `FairPlay: Your shots didnt register due to packet loss`

package/src/servers/ZoneServer2016/zoneserver.ts

@@ -178,7 +178,7 @@ export class ZoneServer2016 extends EventEmitter {
   _db!: Db;
   _soloMode = false;
   _useFairPlay = true;
-  maxPing = 250;
+  _maxPing = 250;
   _decryptKey: string = "";
   _serverName = process.env.SERVER_NAME || "";
   readonly _mongoAddress: string;
@@ -2402,11 +2402,11 @@ export class ZoneServer2016 extends EventEmitter {
     sequenceTime: number,
     position: Float32Array
   ): boolean {
-    if (client.isAdmin || !this._useFairPlay) return false;
+    if (client.isAdmin || !this._useFairPlay || !client.isSynced) return false;
     if (!this.isSaving) {
       const distance = getDistance2d(client.oldPos.position, position);
       if (
-        Number(client.character.lastLoginDate) + 20000 <
+        Number(client.character.lastLoginDate) + 5000 <
         new Date().getTime()
       ) {
         const drift = Math.abs(sequenceTime - this.getServerTime());
@@ -3001,7 +3001,7 @@ export class ZoneServer2016 extends EventEmitter {
         maxSpeed = 2600;
     }
     if (
-      distance > 40 &&
+      distance > 10 &&
       (speed > maxSpeed || speed <= 0 || speed == Infinity)
     ) {
       this.sendChatTextToAdmins(
@@ -3503,7 +3503,7 @@ export class ZoneServer2016 extends EventEmitter {
         if (
           client.character.isAlive &&
           foundation.isInside(client.character.state.position) &&
-          Number(client.character.lastLoginDate) + 15000 < new Date().getTime()
+          Number(client.character.lastLoginDate) + 2000 < new Date().getTime()
         ) {
           const damageInfo: DamageInfo = {
             entity: "Server.Permission",
@@ -3511,7 +3511,7 @@ export class ZoneServer2016 extends EventEmitter {
           };
           this.killCharacter(client, damageInfo);
         }
-      }, 2500);
+      }, 2000);
     }
     this.checkFoundationPermission(client, foundation);
   }
@@ -6213,6 +6213,28 @@ export class ZoneServer2016 extends EventEmitter {
       );
       return;
     }
+    if (client.managedObjects.includes(vehicle.characterId)) {
+      setTimeout(() => {
+        this.dropManagedObject(
+          client,
+          vehicle,
+          vehicle.getNextSeatId(this) == "0" ? true : false
+        );
+        this.sendDataToAllWithSpawnedEntity(
+          this._vehicles,
+          vehicle.characterId,
+          "PlayerUpdatePosition",
+          {
+            transientId: vehicle.transientId,
+            positionUpdate: {
+              ...vehicle.positionUpdate,
+              verticalSpeed: 0,
+              horizontalSpeed: 0,
+            },
+          }
+        );
+      }, 3000);
+    }
     if (vehicle.vehicleId == VehicleIds.SPECTATE) {
       this.sendData(client, "Mount.DismountResponse", {
         characterId: client.character.characterId,
@@ -8074,6 +8096,7 @@ export class ZoneServer2016 extends EventEmitter {
       const client = this._clients[a];
       if (!client.isLoading) {
         client.routineCounter++;
+        this.constructionManager(client);
         this.checkInMapBounds(client);
         this.checkZonePing(client);
         if (client.routineCounter >= 3) {
@@ -8086,7 +8109,6 @@ export class ZoneServer2016 extends EventEmitter {
         this.vehicleManager(client);
         this.spawnCharacters(client);
         this.spawnGridObjects(client);
-        this.constructionManager(client);
         this.worldConstructionManager(client);
         client.posAtLastRoutine = client.character.state.position;
       }
@@ -8096,13 +8118,13 @@ export class ZoneServer2016 extends EventEmitter {
   }
 
   executeRoutine(client: Client) {
+    this.constructionManager(client);
     this.spawnConstructionParentsInRange(client);
     this.vehicleManager(client);
     //this.npcManager(client);
     this.removeOutOfDistanceEntities(client);
     this.spawnCharacters(client);
     this.spawnGridObjects(client);
-    this.constructionManager(client);
     this.worldConstructionManager(client);
     this.POIManager(client);
     client.posAtLastRoutine = client.character.state.position;
@@ -8116,7 +8138,7 @@ export class ZoneServer2016 extends EventEmitter {
     if (soeClient) {
       const ping = soeClient.avgPing;
       client.zonePings.push(ping > 600 ? 600 : ping); // dont push values higher than 600, that would increase average value drasticaly
-      if (ping >= this.maxPing) {
+      if (ping >= this._maxPing) {
         this.sendAlert(
           client,
           `Your ping is very high: ${ping}. You may be kicked soon`
@@ -8125,7 +8147,7 @@ export class ZoneServer2016 extends EventEmitter {
       if (client.zonePings.length >= 15) {
         const averagePing =
           client.zonePings.reduce((a, b) => a + b, 0) / client.zonePings.length;
-        if (averagePing >= this.maxPing) {
+        if (averagePing >= this._maxPing) {
           this.kickPlayer(client);
           this.sendChatTextToAdmins(
             `${client.character.name} has been been kicked for average ping: ${averagePing}`