h1z1-server 0.48.1-2 → 0.48.1-3

package/data/2016/dataSources/AllowedFileHashes.json

@@ -1025,7 +1025,7 @@
   },
   {
     "file_name": "Assets_256.pack",
-    "crc32_hash": "5fd58d48"
+    "crc32_hash": "fe0eaa1f"
   },
   {
     "file_name": "Assets_257.pack",

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

@@ -35,7 +35,7 @@
         },
         {
           "item": 25,
-          "weight": 6,
+          "weight": 8,
           "count": {
             "min": 1,
             "max": 1
@@ -44,4 +44,4 @@
       ]
     }
   ]
-}
+}

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

@@ -66,7 +66,7 @@
         },
         {
           "item": 25,
-          "weight": 1,
+          "weight": 2,
           "count": {
             "min": 10,
             "max": 15
@@ -83,4 +83,4 @@
       ]
     }
   ]
-}
+}

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

@@ -7,7 +7,7 @@
       "entries": [
         {
           "item": 25,
-          "weight": 23,
+          "weight": 33,
           "count": {
             "min": 1,
             "max": 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.48.1-2",
+  "version": "0.48.1-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/managers/constructionmanager.ts

@@ -474,8 +474,6 @@ export class ConstructionManager {
     // for construction entities that don't have a parentObjectCharacterId from the client
     let freeplaceParentCharacterId = "";
     // TODO: SEARCH FOUNDATIONS IN GRID RANGE INSTEAD OF ALL OF THEM
-    // TODO: CHECK DECKS BEFORE TAMPERS SO OBJECTS PLACED ON A DECK DON'T GET INCORRECTLY
-    // PARENTED TO THE TAMPER A DECK IS ON
     for (const a in server._constructionFoundations) {
       const foundation = server._constructionFoundations[a];
       // check if inside a shelter even if not inside foundation (large shelters can extend it)
@@ -507,7 +505,21 @@ export class ConstructionManager {
         });
       }
 
-      // check deck last in case it's parented to a shelter or upper first
+      // check expansion decks before the foundation/tamper itself
+      if (!Number(freeplaceParentCharacterId)) {
+        Object.values(foundation.occupiedExpansionSlots).forEach(
+          (expansion) => {
+            if (
+              !Number(freeplaceParentCharacterId) &&
+              expansion.isInside(position)
+            ) {
+              freeplaceParentCharacterId = expansion.characterId;
+            }
+          }
+        );
+      }
+
+      // check foundation last so expansion decks/shelters take priority
       if (
         !Number(freeplaceParentCharacterId) &&
         foundation.isInside(position)