h1z1-server 0.48.1-0 → 0.48.1-2

package/data/2016/lootTables/containers/Locker.json

@@ -11,7 +11,7 @@
         { "item": 2271, "weight": 25, "count": { "min": 1, "max": 1 } },
         { "item": 2172, "weight": 20, "count": { "min": 1, "max": 1 } },
         { "item": 10,   "weight": 10, "count": { "min": 1, "max": 1 } },
-        { "item": 2229, "weight": 8,  "count": { "min": 1, "max": 1 } }
+        { "item": 2229, "weight": 3,  "count": { "min": 1, "max": 1 } }
       ]
     },
     {

package/data/2016/lootTables/containers/Weapons_Locker.json

@@ -8,7 +8,7 @@
       "rolls": { "min": 0, "max": 1 },
       "entries": [
         { "item": 10,   "weight": 15, "count": { "min": 1, "max": 1 } },
-        { "item": 2229, "weight": 12, "count": { "min": 1, "max": 1 } },
+        { "item": 2229, "weight": 8, "count": { "min": 1, "max": 1 } },
         { "item": 1373, "weight": 8,  "count": { "min": 1, "max": 1 } },
         { "item": 2271, "weight": 30, "count": { "min": 1, "max": 1 } },
         { "item": 2124, "weight": 25, "count": { "min": 1, "max": 1 } }

package/data/2016/lootTables/containers/sub/File_military.json

@@ -7,7 +7,7 @@
       "entries": [
         {
           "item": 2229,
-          "weight": 5,
+          "weight": 2,
           "functions": [{ "function": "set_damage", "min": 0.3, "max": 0.9 }]
         },
         { "item": 2325, "weight": 20, "count": { "min": 1, "max": 3 } },

package/data/2016/lootTables/ground/ItemSpawnerRare_Tier00.adr.json

@@ -132,7 +132,7 @@
       "entries": [
         {
           "item": 2229,
-          "weight": 80,
+          "weight": 10,
           "count": { "min": 1, "max": 1 },
           "functions": [{ "function": "set_damage", "min": 0.2, "max": 0.8 }]
         },

package/data/2016/sampleData/screenEffects.json

@@ -91,6 +91,302 @@
     "unknownDword17": 1.5,
     "unknownDword18": 0.05,
     "unknownDword19": 1082130432
+  },
+  {
+    "id": 9,
+    "typeName": "HALF_ZOMBIE",
+    "duration": 8000,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_zombie_half.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 10,
+    "typeName": "FULL_ZOMBIE",
+    "duration": 8000,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_zombie_full.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 11,
+    "typeName": "FALSE_DAWN",
+    "duration": 8000,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_falsedawn.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 12,
+    "typeName": "TWILIGHT",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_twilight.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 13,
+    "typeName": "DUSK",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_dusk.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 14,
+    "typeName": "DEEP_BLUE",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_deepblue.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 15,
+    "typeName": "IDENTITY",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_identity.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 16,
+    "typeName": "DAY_DESATURATION",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_day_desaturation.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 17,
+    "typeName": "DARK_DESATURATION",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_darkdesaturation.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 18,
+    "typeName": "BLOWNOUT_DESATURATION",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_blownout_desaturation.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 19,
+    "typeName": "NIGHT",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_night.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 20,
+    "typeName": "CONTRAST_DESATURATION",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_contrast_desaturation.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 21,
+    "typeName": "DAY",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_day.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 22,
+    "typeName": "DAWN",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_dawn.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 23,
+    "typeName": "Z2_DAY",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "z2_colorkey_day.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 24,
+    "typeName": "Z2_NIGHT",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "z2_colorkey_night.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 25,
+    "typeName": "Z2_DAWN",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "z2_colorkey_dawn.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 26,
+    "typeName": "NEXUS_DAWN",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "nexus_colorkey_dawn.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 27,
+    "typeName": "GENERIC_CONTRAST",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "colorkey_genericcontrast.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 29,
+    "typeName": "Z2_DUSK",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "z2_colorkey_dusk.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 30,
+    "typeName": "SKY_CLOUDTEST",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "sky_colorkey_cloudtest.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 31,
+    "typeName": "NEXUS_NIGHT",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "nexus_colorkey_night.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 32,
+    "typeName": "NEXUS_NOON",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "nexus_colorkey_noon.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 33,
+    "typeName": "Z2_FALSEDAWN",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "z2_colorkey_falsedawn.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 34,
+    "typeName": "Z2_TWILIGHT",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "z2_colorkey_twilight.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 35,
+    "typeName": "BRILLIANT",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "Brilliant_colorkey.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
+  },
+  {
+    "id": 36,
+    "typeName": "NEXUS_DUSK",
+    "duration": 4294967295,
+    "screenBrightness": 0,
+    "colorGradingFilename": "nexus_colorkey_dusk.tga",
+    "colorGrading": 1,
+    "screenCover": 0,
+    "transparency": 0,
+    "color": "000000"
   }
 ]
-

package/data/defaultDatabase/shared/servers.json

@@ -1,62 +1,63 @@
 [
-    {
-        "serverId": 1,
-        "serverState": 2,
-        "serverAddress": "localhost:1117",
-        "locked": false,
-        "name": "",
-        "nameId": 193,
-        "description": "",
-        "descriptionId": 193,
-        "reqFeatureId": 0,
-        "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
-        "populationLevel": 0,
-        "populationData": "<Population ServerCapacity=\"0\" PingAddress=\"127.0.0.1:1117\" Rulesets=\"PvE\"><factionlist IsList=\"1\"><faction Id=\"1\" Percent=\"0\" TargetPopPct=\"0\" RewardBuff=\"52\" XPBuff=\"52\" PercentAvg=\"0\"/><faction Id=\"2\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"0\"/><faction Id=\"3\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"1\"/></factionlist></Population>",
-        "allowedAccess": false,
-        "populationNumber": 0,
-        "maxPopulationNumber": 100,
-        "gameVersion": 1,
-        "serverVersionTag": "2015",
-        "isDisabled": false
-      },
-      {
-        "serverId": 2,
-        "serverState": 2,
-        "serverAddress": "localhost:1117",
-        "locked": false,
-        "name": "",
-        "nameId": 193,
-        "description": "",
-        "descriptionId": 193,
-        "reqFeatureId": 0,
-        "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
-        "populationLevel": 0,
-        "populationData": "<Population ServerCapacity=\"0\" PingAddress=\"127.0.0.1:1117\" Rulesets=\"PvE\"><factionlist IsList=\"1\"><faction Id=\"1\" Percent=\"0\" TargetPopPct=\"0\" RewardBuff=\"52\" XPBuff=\"52\" PercentAvg=\"0\"/><faction Id=\"2\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"0\"/><faction Id=\"3\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"1\"/></factionlist></Population>",
-        "allowedAccess": true,
-        "populationNumber": 0,
-        "maxPopulationNumber": 100,
-        "gameVersion": 2,
-        "serverVersionTag": "2016",
-        "isDisabled": false
-      },
-      {
-        "serverId": 3,
-        "serverState": 2,
-        "serverAddress": "localhost:1117",
-        "locked": false,
-        "name": "",
-        "nameId": 193,
-        "description": "",
-        "descriptionId": 193,
-        "reqFeatureId": 0,
-        "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
-        "populationLevel": 0,
-        "populationData": "<Population PctCap=\"0\" PingAdr=\"127.0.0.1:1117\" Rulesets=\"\" Mode=\"0\" IsLogin=\"1\" IsWL=\"0\" IsEvt=\"0\" PL=\"0\" DC=\"LVS\" PopLock=\"0\" GP=\"100\" BP=\"175\" MaxPop=\"4000\" Subregion=\"US\"><Fac IsList=\"1\"/></Population>",
-        "allowedAccess": true,
-        "populationNumber": 0,
-        "maxPopulationNumber": 100,
-        "gameVersion": 3,
-        "serverVersionTag": "KOTK",
-        "isDisabled": false
-      }
-]
+  {
+    "serverId": 1,
+    "serverState": 2,
+    "serverAddress": "127.0.0.1:1117",
+    "locked": false,
+    "name": "",
+    "nameId": 193,
+    "description": "",
+    "descriptionId": 193,
+    "reqFeatureId": 0,
+    "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
+    "populationLevel": 0,
+    "populationData": "<Population ServerCapacity=\"0\" PingAddress=\"127.0.0.1:1117\" Rulesets=\"PvE\"><factionlist IsList=\"1\"><faction Id=\"1\" Percent=\"0\" TargetPopPct=\"0\" RewardBuff=\"52\" XPBuff=\"52\" PercentAvg=\"0\"/><faction Id=\"2\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"0\"/><faction Id=\"3\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"1\"/></factionlist></Population>",
+    "allowedAccess": false,
+    "populationNumber": 0,
+    "maxPopulationNumber": 100,
+    "gameVersion": 1,
+    "serverVersionTag": "2015",
+    "isDisabled": false
+  },
+  {
+    "serverId": 2,
+    "serverState": 2,
+    "serverAddress": "127.0.0.1:1117",
+    "locked": false,
+    "name": "",
+    "nameId": 193,
+    "description": "",
+    "descriptionId": 193,
+    "reqFeatureId": 0,
+    "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
+    "populationLevel": 0,
+    "populationData": "<Population ServerCapacity=\"0\" PingAddress=\"127.0.0.1:1117\" Rulesets=\"PvE\"><factionlist IsList=\"1\"><faction Id=\"1\" Percent=\"0\" TargetPopPct=\"0\" RewardBuff=\"52\" XPBuff=\"52\" PercentAvg=\"0\"/><faction Id=\"2\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"0\"/><faction Id=\"3\" Percent=\"0\" TargetPopPct=\"1\" RewardBuff=\"0\" XPBuff=\"0\" PercentAvg=\"1\"/></factionlist></Population>",
+    "allowedAccess": true,
+    "populationNumber": 0,
+    "maxPopulationNumber": 100,
+    "gameVersion": 2,
+    "serverVersionTag": "2016",
+    "isDisabled": false
+  },
+  {
+    "serverId": 3,
+    "serverState": 2,
+    "serverAddress": "127.0.0.1:1117",
+    "locked": false,
+    "name": "",
+    "nameId": 193,
+    "description": "",
+    "descriptionId": 193,
+    "reqFeatureId": 0,
+    "serverInfo": "<ServerInfo Region=\"CharacterCreate.RegionEu\" Subregion=\"UI.SubregionEu\" IsRecommended=\"1\" IsRecommendedVS=\"0\" IsRecommendedNC=\"0\" IsRecommendedTR=\"0\" />",
+    "populationLevel": 0,
+    "populationData": "<Population PctCap=\"0\" PingAdr=\"127.0.0.1:1117\" Rulesets=\"\" Mode=\"0\" IsLogin=\"1\" IsWL=\"0\" IsEvt=\"0\" PL=\"0\" DC=\"LVS\" PopLock=\"0\" GP=\"100\" BP=\"175\" MaxPop=\"4000\" Subregion=\"US\"><Fac IsList=\"1\"/></Population>",
+    "allowedAccess": true,
+    "populationNumber": 0,
+    "maxPopulationNumber": 100,
+    "gameVersion": 3,
+    "serverVersionTag": "KOTK",
+    "isDisabled": false
+  }
+]
+

package/docker-compose.yml

@@ -0,0 +1,56 @@
+services:
+  mongodb:
+    image: mongo:6.0
+    restart: unless-stopped
+    volumes:
+      - mongodb-data:/data/db
+    environment:
+      MONGO_INITDB_DATABASE: h1server
+    ports:
+      - "27018:27017"
+
+  login-server:
+    build:
+      context: .
+      dockerfile: docker/2015/LoginServer.Dockerfile
+    depends_on:
+      - mongodb
+    environment:
+      MONGO_URL: mongodb://127.0.0.1:27018/h1server
+    network_mode: host
+    restart: unless-stopped
+
+  zone-server-2016:
+    build:
+      context: .
+      dockerfile: docker/2016/ZoneServer.Dockerfile
+    depends_on:
+      - mongodb
+      - login-server
+    environment:
+      MONGO_URL: mongodb://127.0.0.1:27018/h1server
+      WORLD_ID: ${WORLD_ID:-2}
+      LOGINSERVER_IP: "127.0.0.1"
+    network_mode: host
+    restart: unless-stopped
+    profiles:
+      - "2016"
+
+  zone-server-2015:
+    build:
+      context: .
+      dockerfile: docker/2015/ZoneServer.Dockerfile
+    depends_on:
+      - mongodb
+      - login-server
+    environment:
+      MONGO_URL: mongodb://127.0.0.1:27018/h1server
+      WORLD_ID: ${WORLD_ID:-0}
+      LOGINSERVER_IP: "127.0.0.1"
+    network_mode: host
+    restart: unless-stopped
+    profiles:
+      - "2015"
+
+volumes:
+  mongodb-data:

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "h1z1-server",
-  "version": "0.48.1-0",
+  "version": "0.48.1-2",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <quentingruber@gmail.com> (http://github.com/quentingruber)",
   "license": "GPL-3.0-only",
   "main": "h1z1-server.js",
   "engines": {
-    "node": ">=0.24.0 <26"
+    "node": ">=0.24.0 <27"
   },
   "bin": {
     "h1z1-server-demo": "scripts/h1z1-server-demo.js",
@@ -14,29 +14,29 @@
   },
   "dependencies": {
     "@types/js-yaml": "4.0.9",
-    "@types/node": "25.2.0",
+    "@types/node": "25.9.1",
     "@types/ws": "8.18.1",
     "debug": "4.4.3",
-    "elastic-apm-node": "^4.15.0",
+    "elastic-apm-node": "4.15.0",
     "h1emu-core": "1.3.2",
-    "h1z1-dataschema": "1.9.2",
+    "h1z1-dataschema": "1.9.3",
     "js-yaml": "4.1.1",
     "mongodb": "6.20.0",
-    "recast-navigation": "0.43.0",
+    "recast-navigation": "0.43.1",
     "threads": "1.7.0",
-    "typescript": "5.9.3",
-    "ws": "8.19.0"
+    "typescript": "6.0.3",
+    "ws": "8.21.0"
   },
   "directories": {
     "src": "./src"
   },
   "devDependencies": {
     "cross-env": "^10.1.0",
-    "globals": "^17.3.0",
-    "oxlint": "^1.43.0",
-    "prettier": "^3.8.1",
-    "tsx": "^4.21.0",
-    "typedoc": "^0.28.16"
+    "globals": "^17.6.0",
+    "oxlint": "^1.67.0",
+    "prettier": "^3.8.3",
+    "tsx": "^4.22.3",
+    "typedoc": "^0.28.19"
   },
   "scripts": {
     "gen-packets-types": "tsx ./scripts/genPacketsNames.ts",

package/plugins/TestPlugin/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "target": "ES2023" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
     "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
     "allowJs": true /* Allow javascript files to be compiled. */,
     "declaration": true /* Generates corresponding '.d.ts' file. */,
@@ -9,7 +9,11 @@
     "baseUrl": "./src" /* Base directory to resolve non-absolute module names. */,
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
     "skipLibCheck": true /* Skip type checking of declaration files. */,
-    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
+    "sourceMap": true,
+    "incremental": true,
+    "experimentalDecorators": true,
+    "types": ["node"]
   },
   "include": ["src/"]
 }

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

@@ -10,6 +10,9 @@ export class GridCell {
   width: number;
   height: number;
   availableScrap: number;
+  /** Timestamp of the last time an entity was added to this cell.
+   *  Used to skip re-scanning cells that haven't changed since the client's last heavy-scan pass. */
+  lastModified = 0;
   constructor(
     server: ZoneServer2016,
     x: number,

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

@@ -4,13 +4,23 @@ import { BaseEntity } from "../entities/baseentity";
  * A Set<BaseEntity> that keeps an external inverse-observer registry in sync.
  * The registry maps entity.characterId → Set<TOwner> so callers can look up
  * which owners have a given entity without iterating the full owner list.
+ *
+ * Optionally accepts a filterSet + filterPredicate pair: entities matching the
+ * predicate are mirrored into filterSet on add/delete/clear automatically.
  */
 export class TrackedEntitySet<TOwner> extends Set<BaseEntity> {
+  private readonly _filterSet?: Set<BaseEntity>;
+  private readonly _filterPredicate?: (entity: BaseEntity) => boolean;
+
   constructor(
     private readonly _registry: Map<string, Set<TOwner>>,
-    private readonly _owner: TOwner
+    private readonly _owner: TOwner,
+    filterSet?: Set<BaseEntity>,
+    filterPredicate?: (entity: BaseEntity) => boolean
   ) {
     super();
+    this._filterSet = filterSet;
+    this._filterPredicate = filterPredicate;
   }
 
   add(entity: BaseEntity): this {
@@ -22,6 +32,9 @@ export class TrackedEntitySet<TOwner> extends Set<BaseEntity> {
         this._registry.set(entity.characterId, obs);
       }
       obs.add(this._owner);
+      if (this._filterSet && this._filterPredicate?.(entity)) {
+        this._filterSet.add(entity);
+      }
     }
     return this;
   }
@@ -29,6 +42,7 @@ export class TrackedEntitySet<TOwner> extends Set<BaseEntity> {
   delete(entity: BaseEntity): boolean {
     if (super.delete(entity)) {
       this._registry.get(entity.characterId)?.delete(this._owner);
+      this._filterSet?.delete(entity);
       return true;
     }
     return false;
@@ -38,6 +52,7 @@ export class TrackedEntitySet<TOwner> extends Set<BaseEntity> {
     for (const entity of this) {
       this._registry.get(entity.characterId)?.delete(this._owner);
     }
+    this._filterSet?.clear();
     super.clear();
   }
 }