From 29dbc7fb19718de3f24ec12f621276314d34a110 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Dec 2018 19:44:38 +1100
Subject: [PATCH] fix housing furnishings menu not closing properly

---
 .../Network/Handlers/ClientTriggerHandler.cpp             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index c1160246..277ac909 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -411,7 +411,13 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
     }
     case ClientTriggerType::RequestHousingItemUI:
     {
-      uint8_t ward = ( param12 & 0xFF00 ) >> 8;
+      // close ui
+      if( param11 == 1 )
+        break;
+
+      // param12 is 0 when inside a house
+
+      uint8_t ward = ( param12 >> 16 ) & 0xFF;
       uint8_t plot = ( param12 & 0xFF );
       auto pShowHousingItemUIPacket = makeActorControl142( player.getId(), ShowHousingItemUI, 0, plot );