Fixing some little issues with the game engine changes

Author: Tynarus

src/game-engine/net/outbound-packets.ts

@@ -608,7 +608,7 @@ export class OutboundPackets {
                         mapTileOffsetY = 12;
                     }
 
-                    const constructedChunk: ConstructedChunk | null = mapData.chunks[level][x][y];
+                    const constructedChunk: ConstructedChunk | null = mapData.chunks[level][mapTileOffsetX][mapTileOffsetY];
                     packet.putBits(1, constructedChunk === null ? 0 : 1)
                     if (constructedChunk !== null) {
                         const { templatePosition, rotation } = constructedChunk;

src/game-engine/world/index.ts

@@ -86,13 +86,13 @@ export class World {
 
         const objectChunk = this.chunkManager.getChunkForWorldPosition(objectPosition);
 
+        let customMap = false;
         if(actor instanceof Player && actor.metadata.customMap) {
+            customMap = true;
             const templateMapObject = this.findCustomMapObject(actor, objectId, objectPosition);
             if(templateMapObject) {
                 return { object: templateMapObject, cacheOriginal: true };
             }
-
-            return { object: null, cacheOriginal: false };
         }
 
         let cacheOriginal = true;
@@ -107,7 +107,7 @@ export class World {
             tileModifications = this.globalInstance.getTileModifications(objectPosition);
         }
 
-        let landscapeObject = objectChunk.getFilestoreLandscapeObject(objectId, objectPosition);
+        let landscapeObject = customMap ? null : objectChunk.getFilestoreLandscapeObject(objectId, objectPosition);
         if(!landscapeObject) {
             const tileObjects = [ ...tileModifications.mods.spawnedObjects ];
 
@@ -174,10 +174,21 @@ export class World {
         const mapTemplateWorldY = tileY;
         const mapTemplateChunk = world.chunkManager.getChunkForWorldPosition(new Position(mapTemplateWorldX, mapTemplateWorldY, objectPosition.level));
 
-        const templateObjectPosition = new Position(mapTemplateWorldX + getTemplateLocalX(tileOrientation, objectLocalX, objectLocalY),
-            mapTemplateWorldY + getTemplateLocalY(tileOrientation, objectLocalX, objectLocalY), objectPosition.level);
+        const templateLocalX = getTemplateLocalX(tileOrientation, objectLocalX, objectLocalY);
+        const templateLocalY = getTemplateLocalY(tileOrientation, objectLocalX, objectLocalY);
+
+        if(actor instanceof Player) {
+            actor.sendMessage(`Tile Orientation ${tileOrientation}, Local ${templateLocalX},${templateLocalY}`);
+        }
+
+        const templateObjectPosition = new Position(mapTemplateWorldX + templateLocalX,
+            mapTemplateWorldY + templateLocalY, objectPosition.level);
         const realObject = mapTemplateChunk.getFilestoreLandscapeObject(objectId, templateObjectPosition);
 
+        if(!realObject) {
+            return null;
+        }
+
         realObject.x = objectPosition.x;
         realObject.y = objectPosition.y;
         realObject.level = objectPosition.level;

src/plugins/skills/construction/construction.plugin.ts

@@ -59,9 +59,12 @@ const openHouse = (player: Player): void => {
         for(let chunkX = 0; chunkX < 13; chunkX++) {
             for(let chunkY = 0; chunkY < 13; chunkY++) {
                 const room = house.rooms[plane][chunkX][chunkY];
+                if(!room) {
+                    continue;
+                }
                 const templatePosition = room.templatePosition;
                 const templateChunk = world.chunkManager.getChunk(templatePosition);
-
+                // ??? think this is just loading the template chunks into memory
             }
         }
     }