h1z1-server 0.23.1 → 0.23.2

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

@@ -519,6 +519,7 @@ export class ConstructionParentEntity extends ConstructionChildEntity {
     characterId: string,
     permission: ConstructionPermissionIds
   ) {
+    if (characterId == this.ownerCharacterId) return true;
     switch (permission) {
       case ConstructionPermissionIds.BUILD:
         return this.permissions[characterId]?.build;
@@ -530,8 +531,13 @@ export class ConstructionParentEntity extends ConstructionChildEntity {
         return this.permissions[characterId]?.visit;
     }
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     if (this.canUndoPlacement(server, client)) {
       this.destroy(server);
       client.character.lootItem(

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

@@ -140,8 +140,13 @@ export class DoorEntity extends BaseLightweightCharacter {
     this.openSound = openSound;
     this.closeSound = closeSound;
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     client; // eslint
     if (this.moving) {
       return;

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

@@ -62,8 +62,13 @@ export class ItemObject extends BaseLightweightCharacter {
     super(characterId, transientId, actorModelId, position, rotation, server);
     (this.spawnerId = spawnerId), (this.item = item);
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     server.pickupItem(client, this.characterId);
   }
 

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

@@ -142,8 +142,13 @@ export class LootableConstructionEntity extends BaseLootableEntity {
       ) || false
     );
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     if (this.canUndoPlacement(server, client)) {
       this.destroy(server);
       client.character.lootItem(

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

@@ -169,7 +169,13 @@ export class LootableProp extends BaseLootableEntity {
     this.loadoutId = 5;
     getContainerAndTime(this);
   }
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     if (!client.searchedProps.includes(this)) {
       server.utilizeHudTimer(
         client,

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

@@ -116,8 +116,13 @@ export class Plant extends ItemObject {
     const timeToAdd = this.isFertilized ? this.growTime / 2 : this.growTime; // 4 or 8h based on fertilized or not
     this.nextStateTime = new Date().getTime() + timeToAdd;
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     if (this.growState != 3) return;
     if (!server._temporaryObjects[this.parentObjectCharacterId]) {
       server.deleteEntity(this.characterId, server._plants);

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

@@ -478,8 +478,13 @@ export class Vehicle2016 extends BaseLootableEntity {
       );
     }
   }
-
-  OnPlayerSelect(server: ZoneServer2016, client: ZoneClient2016) {
+  /* eslint-disable @typescript-eslint/no-unused-vars */
+  OnPlayerSelect(
+    server: ZoneServer2016,
+    client: ZoneClient2016,
+    isInstant?: boolean
+    /* eslint-enable @typescript-eslint/no-unused-vars */
+  ) {
     !client.vehicle.mountedVehicle
       ? server.mountVehicle(client, this.characterId)
       : server.dismountVehicle(client);

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

@@ -34,7 +34,10 @@ function getCraftComponentsDataSource(client: Client): {
       if (inventory[item.itemDefinitionId]) {
         inventory[item.itemDefinitionId].stackCount += item.stackCount;
       } else {
-        inventory[item.itemDefinitionId] = { ...item }; // push new itemstack
+        inventory[item.itemDefinitionId] = {
+          ...item,
+          stackCount: item.stackCount,
+        }; // push new itemstack
       }
     });
   });

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

@@ -972,9 +972,12 @@ export class WorldDataManager {
         JSON.stringify(construction, null, 2)
       );
     } else {
+      const tempCollection = server._db?.collection("construction-temp");
+      if (construction.length) await tempCollection?.insertMany(construction);
       const collection = server._db?.collection("construction");
-      collection?.deleteMany({ serverId: server._worldId });
-      if (construction.length) collection?.insertMany(construction);
+      await collection?.deleteMany({ serverId: server._worldId });
+      if (construction.length) await collection?.insertMany(construction);
+      await tempCollection?.deleteMany({ serverId: server._worldId });
     }
   }
 
@@ -1022,8 +1025,11 @@ export class WorldDataManager {
       );
     } else {
       const collection = server._db?.collection("crops");
-      collection?.deleteMany({ serverId: server._worldId });
-      if (crops.length) collection?.insertMany(crops);
+      const tempCollection = server._db?.collection("crops-temp");
+      if (crops.length) await tempCollection?.insertMany(crops);
+      await collection?.deleteMany({ serverId: server._worldId });
+      if (crops.length) await collection?.insertMany(crops);
+      await tempCollection?.deleteMany({ serverId: server._worldId });
     }
   }
 
@@ -1120,8 +1126,11 @@ export class WorldDataManager {
       );
     } else {
       const collection = server._db?.collection("worldconstruction");
-      collection?.deleteMany({ serverId: server._worldId });
-      if (freeplace.length) collection?.insertMany(freeplace);
+      const tempCollection = server._db?.collection("worldconstruction-temp");
+      if (freeplace.length) await tempCollection?.insertMany(freeplace);
+      await collection?.deleteMany({ serverId: server._worldId });
+      if (freeplace.length) await collection?.insertMany(freeplace);
+      await tempCollection?.deleteMany({ serverId: server._worldId });
     }
   }
 

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

@@ -134,6 +134,7 @@ export class WorldObjectManager {
       this.createLoot(server);
       this.createContainerLoot(server);
       this.lastLootRespawnTime = Date.now();
+      server.divideLargeCells(700);
     }
     if (this.lastNpcRespawnTime + this.npcRespawnTimer <= Date.now()) {
       this.createNpcs(server);
@@ -456,7 +457,9 @@ export class WorldObjectManager {
   createContainerLoot(server: ZoneServer2016) {
     for (const a in server._lootableProps) {
       const prop = server._lootableProps[a] as LootableProp;
-      if (!!Object.keys(prop._containers["31"].items).length) continue; // skip if container is not empty
+      const container = prop.getContainer();
+      if (!container) continue;
+      if (!!Object.keys(container.items).length) continue; // skip if container is not empty
       const lootTable = containerLootSpawners[prop.lootSpawner];
       if (lootTable) {
         for (let x = 0; x < lootTable.maxItems; x++) {
@@ -464,11 +467,9 @@ export class WorldObjectManager {
           if (!item) continue;
           const chance = Math.floor(Math.random() * 100) + 1; // temporary spawnchance
           let allow = true;
-          Object.values(prop._containers["31"].items).forEach(
-            (spawnedItem: BaseItem) => {
-              if (item.item == spawnedItem.itemDefinitionId) allow = false; // dont allow the same item to be added twice
-            }
-          );
+          Object.values(container.items).forEach((spawnedItem: BaseItem) => {
+            if (item.item == spawnedItem.itemDefinitionId) allow = false; // dont allow the same item to be added twice
+          });
           if (allow) {
             if (chance <= item.weight) {
               const count = Math.floor(
@@ -480,7 +481,7 @@ export class WorldObjectManager {
               server.addContainerItemExternal(
                 prop.mountedCharacter ? prop.mountedCharacter : "",
                 server.generateItem(item.item),
-                prop._containers["31"],
+                container,
                 count
               );
             }
@@ -489,7 +490,7 @@ export class WorldObjectManager {
           }
         }
       }
-      if (Object.keys(prop._containers["31"].items).length != 0) {
+      if (Object.keys(container.items).length != 0) {
         // mark prop as unsearched for clients
         Object.values(server._clients).forEach((client: ZoneClient2016) => {
           const index = client.searchedProps.indexOf(prop);

package/src/servers/ZoneServer2016/zonepackethandlers.ts

@@ -457,30 +457,23 @@ export class zonePacketHandlers {
     this.commandHandler.executeCommand(server, client, packet);
   }
   CommandInteractRequest(server: ZoneServer2016, client: Client, packet: any) {
-    server.sendData(client, "Command.InteractionString", {
-      guid: packet.data.guid,
-      stringId: 5463,
-      unknown4: 0,
-    });
-    server.sendData(client, "Command.InteractionList", {
-      guid: packet.data.guid,
-      unknownBoolean1: true,
-      unknownArray1: [
-        {
-          unknownDword1: 11,
-          unknownDword2: 0,
-          unknownDword3: 5463,
-          unknownDword4: 51,
-          unknownDword5: 1,
-          unknownDword6: 0,
-          unknownDword7: 0,
-        },
-      ],
-      unknownString1: "",
-      unknownBoolean2: true,
-      unknownArray2: [],
-      unknownBoolean3: false,
-    });
+    const entity = server.getEntity(packet.data.characterId);
+    if (!entity) return;
+    const isConstruction =
+      entity instanceof ConstructionParentEntity ||
+      entity instanceof ConstructionDoor;
+    if (
+      !isPosInRadius(
+        isConstruction ? 4 : server._interactionDistance,
+        client.character.state.position,
+        isConstruction
+          ? entity.fixedPosition || entity.state.position
+          : entity.state.position
+      )
+    )
+      return;
+
+    entity.OnPlayerSelect(server, client, packet.data.isInstant);
   }
   CommandInteractCancel(server: ZoneServer2016, client: Client, packet: any) {
     debug("Interaction Canceled");
@@ -824,23 +817,7 @@ export class zonePacketHandlers {
     entity.OnFullCharacterDataRequest(server, client);
   }
   CommandPlayerSelect(server: ZoneServer2016, client: Client, packet: any) {
-    const entity = server.getEntity(packet.data.guid);
-    if (!entity) return;
-    const isConstruction =
-      entity instanceof ConstructionParentEntity ||
-      entity instanceof ConstructionDoor;
-    if (
-      !isPosInRadius(
-        isConstruction ? 4 : server._interactionDistance,
-        client.character.state.position,
-        isConstruction
-          ? entity.fixedPosition || entity.state.position
-          : entity.state.position
-      )
-    )
-      return;
-
-    entity.OnPlayerSelect(server, client);
+    debug("Command.PlayerSelect");
   }
   LockssetLock(server: ZoneServer2016, client: Client, packet: any) {
     if (!client.character.currentInteractionGuid || packet.data.password === 1)
@@ -848,11 +825,19 @@ export class zonePacketHandlers {
     const doorEntity = server._constructionDoors[
       client.character.currentInteractionGuid
     ] as ConstructionDoor;
+    if (!doorEntity) return;
     if (doorEntity.ownerCharacterId === client.character.characterId) {
-      doorEntity.passwordHash = packet.data.password;
-      doorEntity.grantedAccess.push(client.character.characterId);
+      if (doorEntity.passwordHash != packet.data.password) {
+        doorEntity.passwordHash = packet.data.password;
+        doorEntity.grantedAccess = [];
+        doorEntity.grantedAccess.push(client.character.characterId);
+      }
+      return;
     }
-    if (doorEntity.passwordHash === packet.data.password) {
+    if (
+      doorEntity.passwordHash === packet.data.password &&
+      !doorEntity.grantedAccess.includes(client.character.characterId)
+    ) {
       doorEntity.grantedAccess.push(client.character.characterId);
     }
   }
@@ -1301,7 +1286,10 @@ export class zonePacketHandlers {
     if (!characterId) {
       return;
     }
-    if (characterId == foundation.ownerCharacterId) return;
+    if (characterId == foundation.ownerCharacterId) {
+      server.sendAlert(client, "You can't edit your own permissions.");
+      return;
+    }
     const obj: ConstructionPermissions = foundation.permissions[characterId];
     switch (packet.data.permissionSlot) {
       case 1:
@@ -1363,6 +1351,10 @@ export class zonePacketHandlers {
       }
     }
 
+    if (characterId == foundation.ownerCharacterId) {
+      server.sendAlert(client, "You can't edit your own permissions.");
+      return;
+    }
     if (!characterId) return;
     let obj: ConstructionPermissions = foundation.permissions[characterId];
     if (!obj) {
@@ -1604,7 +1596,8 @@ export class zonePacketHandlers {
           if (
             !weaponItem.weapon?.ammoCount &&
             weaponItem.itemDefinitionId != Items.WEAPON_BOW_MAKESHIFT &&
-            weaponItem.itemDefinitionId != Items.WEAPON_BOW_RECURVE
+            weaponItem.itemDefinitionId != Items.WEAPON_BOW_RECURVE &&
+            weaponItem.itemDefinitionId != Items.WEAPON_BOW_WOOD
           )
             return;
           if (p.packet.firestate > 0) {
@@ -1731,7 +1724,8 @@ export class zonePacketHandlers {
 
           if (
             weaponItem.itemDefinitionId == Items.WEAPON_BOW_MAKESHIFT ||
-            weaponItem.itemDefinitionId == Items.WEAPON_BOW_RECURVE
+            weaponItem.itemDefinitionId == Items.WEAPON_BOW_RECURVE ||
+            weaponItem.itemDefinitionId == Items.WEAPON_BOW_WOOD
           ) {
             if (
               client.character.getEquippedWeapon().itemGuid !=