From 94929caf96d39ebfb7b12e6ad05fdbf47ae874c7 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 24 Jan 2023 21:49:44 +0100
Subject: [PATCH] WiP more housing.

---
 src/common/Common.h                 | 2 +-
 src/world/Territory/HousingZone.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 0e2ea771..98b212f4 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -1593,9 +1593,9 @@ namespace Sapphire::Common
     uint8_t status;
     uint8_t flags;
     uint8_t __padding1;
+    uint8_t unknown1[4];
     uint32_t fcCrestId;
     uint32_t fcCrestId1;
-    uint8_t unknown1[4];
     uint8_t patternIds[8];
     uint8_t colors[8];
     uint8_t unknown2[8];
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index 5fd877af..d51fbb54 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -189,9 +189,10 @@ void Sapphire::HousingZone::sendLandSet( Entity::Player& player )
   landsetInitializePacket->data().LandSetId.wardNum = m_wardNum;
   landsetInitializePacket->data().LandSetId.landId = m_landSetId;
   landsetInitializePacket->data().LandSetId.territoryTypeId = m_territoryTypeId;
-  //TODO: get current WorldId
   landsetInitializePacket->data().LandSetId.worldId = server.getWorldId();
-  landsetInitializePacket->data().Subdivision = 1;
+
+  auto isInSubdivision = isPlayerSubInstance( player );
+  landsetInitializePacket->data().Subdivision = isInSubdivision ? 2 : 1;
   for( uint8_t i = 0, count = 0; i < 30; ++i, ++count )
   {
     auto pLand = getLand( i );
@@ -202,6 +203,7 @@ void Sapphire::HousingZone::sendLandSet( Entity::Player& player )
     landData.size = pLand->getSize();
     landData.status = pLand->getStatus();
     landData.flags = pLand->getSharing();
+    landData.fcCrestId = 1;
     /* //disbaled until we managed fc's
     landData.fcCrestId = pLand->getFcId();
     landData.fcIcon = pLand->getFcIcon();