h1z1-server 0.23.5 → 0.23.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.23.5",
+  "version": "0.23.6",
   "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/commands/commands.ts

@@ -20,6 +20,7 @@ import {
   _,
   getDifference,
   isPosInRadius,
+  toHex,
 } from "../../../utils/utils";
 import { ExplosiveEntity } from "../entities/explosiveentity";
 import { Npc } from "../entities/npc";
@@ -530,6 +531,7 @@ export const commands: Array<Command> = [
       client.character.state.position = locationPosition;
       client.isLoading = true;
       client.characterReleased = false;
+      client.character.lastLoginDate = toHex(Date.now());
       server.sendData(client, "ClientUpdate.UpdateLocation", {
         position: locationPosition,
         triggerLoadingScreen: true,
@@ -562,6 +564,7 @@ export const commands: Array<Command> = [
       targetClient.character.state.position = client.character.state.position;
       targetClient.isLoading = true;
       targetClient.characterReleased = false;
+      targetClient.character.lastLoginDate = toHex(Date.now());
       server.sendData(targetClient, "ClientUpdate.UpdateLocation", {
         position: client.character.state.position,
         triggerLoadingScreen: true,
@@ -598,6 +601,7 @@ export const commands: Array<Command> = [
       client.character.state.position = targetClient.character.state.position;
       client.isLoading = true;
       client.characterReleased = false;
+      client.character.lastLoginDate = toHex(Date.now());
       server.sendData(client, "ClientUpdate.UpdateLocation", {
         position: targetClient.character.state.position,
         triggerLoadingScreen: true,
@@ -1511,7 +1515,7 @@ export const commands: Array<Command> = [
         );
         return;
       }
-      const name = args.join(" ").toString().toLowerCase();
+      const name = args.join(" ").toString();
       const bannedClient = (
         await server._db
           ?.collection(DB_COLLECTIONS.BANNED)

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

@@ -22,14 +22,14 @@ function getRenderDistance(itemDefinitionId: number) {
     case Items.WORKBENCH_WEAPON:
     case Items.BEE_BOX:
     case Items.DEW_COLLECTOR:
-      range = 250;
+      range = 100;
       break;
     case Items.STORAGE_BOX:
     case Items.ANIMAL_TRAP:
       range = 20;
       break;
     default:
-      range = 350;
+      range = 300;
       break;
   }
   return range;

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

@@ -61,10 +61,10 @@ export class LootableConstructionEntity extends BaseLootableEntity {
     this.defaultLoadout = lootableContainerDefaultLoadouts.storage;
     if (subEntityType === "SmeltingEntity") {
       this.subEntity = new SmeltingEntity(this, server);
-      this.npcRenderDistance = 250;
+      this.npcRenderDistance = 20; //this.npcRenderDistance = 250; lower render distances until next wipe (furnaces were invis and people have multiple at one one, causes lag)
     } else if (subEntityType === "CollectingEntity") {
       this.subEntity = new CollectingEntity(this, server);
-      this.npcRenderDistance = 250;
+      this.npcRenderDistance = 20; //this.npcRenderDistance = 250;
     } else {
       this.npcRenderDistance = 20;
     }

package/src/servers/ZoneServer2016/managers/decaymanager.ts

@@ -98,15 +98,11 @@ export class DecayManager {
       | ConstructionChildEntity
   ) {
     const dictionary = server.getConstructionDictionary(entity.characterId);
+    if (!dictionary[entity.characterId]) return;
     entity.damage(server, {
       entity: "",
       damage: 125000,
     });
-    if (entity.health <= 0) {
-      entity.destroy(server);
-      return;
-    }
-    if (!dictionary[entity.characterId]) return;
     server.updateResourceToAllWithSpawnedEntity(
       entity.characterId,
       entity.health,
@@ -114,6 +110,8 @@ export class DecayManager {
       ResourceTypes.CONDITION,
       dictionary
     );
+    if (entity.health > 0) return;
+    entity.destroy(server);
   }
 
   private contructionDecayDamage(server: ZoneServer2016) {
@@ -123,6 +121,15 @@ export class DecayManager {
     for (const a in server._worldSimpleConstruction) {
       this.decayDamage(server, server._worldSimpleConstruction[a]);
     }
+    for (const a in server._constructionSimple) {
+      this.decayDamage(server, server._constructionSimple[a]);
+    }
+    for (const a in server._lootableConstruction) {
+      this.decayDamage(server, server._lootableConstruction[a]);
+    }
+    for (const a in server._constructionDoors) {
+      this.decayDamage(server, server._constructionDoors[a]);
+    }
     for (const a in server._constructionFoundations) {
       const foundation = server._constructionFoundations[a];
       if (
@@ -132,32 +139,10 @@ export class DecayManager {
       ) {
         this.decayDamage(server, foundation);
       }
-      Object.values(foundation.freeplaceEntities).forEach(
-        (
-          entity:
-            | LootableConstructionEntity
-            | ConstructionDoor
-            | ConstructionChildEntity
-        ) => {
-          this.decayDamage(server, entity);
-        }
-      );
-      Object.values(foundation.occupiedShelterSlots).forEach(
-        (entity: ConstructionDoor | ConstructionChildEntity) => {
-          if (entity instanceof ConstructionChildEntity) {
-            this.decayChildEntity(server, entity);
-          }
-        }
-      );
-      Object.values(foundation.occupiedWallSlots).forEach(
-        (entity: ConstructionDoor | ConstructionChildEntity) => {
-          this.decayChildEntity(server, entity);
-        }
-      );
     }
   }
 
-  private decayChildEntity(
+  /*private decayChildEntity(
     server: ZoneServer2016,
     entity: ConstructionChildEntity | ConstructionDoor
   ) {
@@ -179,5 +164,5 @@ export class DecayManager {
       );
     }
     this.decayDamage(server, entity);
-  }
+  }*/
 }

package/src/servers/ZoneServer2016/managers/worlddatamanager.ts

@@ -36,7 +36,7 @@ import {
   fixDbTempData,
   getAppDataFolderPath,
   initMongo,
-  isTransferable,
+  removeUntransferableFields,
   toBigHex,
 } from "../../../utils/utils";
 import { ZoneServer2016 } from "../zoneserver";
@@ -449,9 +449,8 @@ export class WorldDataManager {
       const character = characters[i];
       const characterSave = this.convertToCharacterSaveData(character, worldId);
       // TODO: this is a temp solution, a deepclone slow down the save process :(
-      if (isTransferable(characterSave)) {
-        charactersSaveData.push(characterSave);
-      }
+      removeUntransferableFields(characterSave);
+      charactersSaveData.push(characterSave);
     }
     return charactersSaveData;
   }

package/src/servers/ZoneServer2016/zoneserver.ts

@@ -91,6 +91,7 @@ import {
   isInsideSquare,
   getDifference,
   logClientActionToMongo,
+  removeUntransferableFields,
 } from "../../utils/utils";
 
 import { Collection, Db } from "mongodb";
@@ -168,7 +169,7 @@ export class ZoneServer2016 extends EventEmitter {
   _db!: Db;
   _soloMode = false;
   _useFairPlay = true;
-  maxPing = 200;
+  maxPing = 250;
   _serverName = process.env.SERVER_NAME || "";
   readonly _mongoAddress: string;
   private readonly _clientProtocol = "ClientProtocol_1080";
@@ -1025,23 +1026,24 @@ export class ZoneServer2016 extends EventEmitter {
       );
       const worldConstructions: LootableConstructionSaveData[] = [];
       Object.values(this._worldLootableConstruction).forEach((entity) => {
-        worldConstructions.push(
+        const lootableConstructionSaveData =
           WorldDataManager.getLootableConstructionSaveData(
             entity,
             this._worldId
-          )
-        );
+          );
+        removeUntransferableFields(lootableConstructionSaveData);
+        worldConstructions.push(lootableConstructionSaveData);
       });
       const constructions: ConstructionParentSaveData[] = [];
 
       Object.values(this._constructionFoundations).forEach((entity) => {
         if (entity.itemDefinitionId != Items.FOUNDATION_EXPANSION) {
-          constructions.push(
-            WorldDataManager.getConstructionParentSaveData(
-              entity,
-              this._worldId
-            )
+          const construction = WorldDataManager.getConstructionParentSaveData(
+            entity,
+            this._worldId
           );
+          // isTransferable(construction) too complex will run on max recursive call error
+          constructions.push(construction);
         }
       });
       const crops: PlantingDiameterSaveData[] = [];
@@ -1926,6 +1928,7 @@ export class ZoneServer2016 extends EventEmitter {
     }
     client.isLoading = true;
     client.characterReleased = false;
+    client.character.lastLoginDate = toHex(Date.now());
     client.character.resetMetrics();
     client.character.isAlive = true;
     client.character.isRunning = false;
@@ -4231,22 +4234,21 @@ export class ZoneServer2016 extends EventEmitter {
       const permissions =
         iteratedFoundation.permissions[client.character.characterId];
       if (!permissions || !permissions.build) continue;
+      if (iteratedFoundation.characterId == parentObjectCharacterId) {
+        isInFoundation = true;
+        break;
+      }
       if (iteratedFoundation.bounds) {
         if (iteratedFoundation.isInside(position)) isInFoundation = true;
       }
     }
-    const allowedIds = [
-      Items.FOUNDATION_EXPANSION,
-      Items.FOUNDATION_RAMP,
-      Items.FOUNDATION_STAIRS,
-    ];
+
     for (const a in this._constructionFoundations) {
       const foundation = this._constructionFoundations[a];
       let allowBuild = false;
       const permissions = foundation.permissions[client.character.characterId];
       if (permissions && permissions.build) allowBuild = true;
       if (
-        !allowedIds.includes(itemDefinitionId) &&
         !isInFoundation &&
         isPosInRadius(
           foundation.itemDefinitionId === Items.FOUNDATION ||
@@ -7201,6 +7203,8 @@ export class ZoneServer2016 extends EventEmitter {
   }
 
   checkZonePing(client: Client) {
+    if (Number(client.character.lastLoginDate) + 30000 > new Date().getTime())
+      return;
     const soeClient = this.getSoeClient(client.soeClientId);
     if (soeClient) {
       const ping = soeClient.avgPing;
@@ -7211,7 +7215,7 @@ export class ZoneServer2016 extends EventEmitter {
           `Your ping is very high: ${ping}. You may be kicked soon`
         );
       }
-      if (client.zonePings.length >= 10) {
+      if (client.zonePings.length >= 15) {
         const averagePing =
           client.zonePings.reduce((a, b) => a + b, 0) / client.zonePings.length;
         if (averagePing >= this.maxPing) {

package/src/utils/utils.ts

@@ -829,13 +829,19 @@ export async function fixDbTempData(
   await db?.collection(tempCollection).deleteMany({ serverId: worldId });
 }
 
-export function isTransferable(data: unknown): boolean {
-  try {
-    structuredClone(data);
-    return true;
-  } catch (e) {
-    console.log(`can't clone ${data}`);
-    console.log(e);
-    return false;
+export function removeUntransferableFields(data: any) {
+  const allowedTypes = ["string", "number", "boolean", "undefined", "bigint"];
+
+  for (const key in data) {
+    // eslint-disable-next-line no-prototype-builtins
+    if (data.hasOwnProperty(key)) {
+      const value = data[key];
+      if (typeof value === "object") {
+        removeUntransferableFields(value);
+      } else if (!allowedTypes.includes(typeof value)) {
+        console.log(`Invalid value type: ${typeof value}.`);
+        delete data[key];
+      }
+    }
   }
 }