From 50c262d11b18da6e1643d175c0da27e390598029 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 7 Dec 2018 23:38:45 +1100
Subject: [PATCH] new and improved:tm: naming convention has been rejected

---
 src/common/Network/CommonActorControl.h                       | 4 ++--
 .../sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index b5586709..1f55a52b 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -311,13 +311,13 @@ enum ActorControlType : uint16_t
     RequestLandSignOwned = 0x452,
     RequestWardLandInfo = 0x453,
     RequestLandRelinquish = 0x454,
-    RequestHousingLandInventory = 0x0458,
+    RequestLandInventory = 0x0458,
     RequestEstateRename = 0x45A,
     RequestEstateEditGreeting = 0x45B,
     RequestEstateGreeting = 0x45C, // sends FFXIVIpcHousingEstateGreeting in return
     RequestEstateEditGuestAccessSettings = 0x45D,
     RequestEstateTagSettings = 0x45F,
-    RequestHousingEstateInventory = 0x0461,
+    RequestEstateInventory = 0x0461,
     RequestHousingItemUI = 0x463,
     RequestSharedEstateSettings = 0x46F,
     UpdateEstateLightingLevel = 0x471,
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index fcc6eb00..b2236677 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -421,7 +421,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
 
       break;
     }
-    case ClientTriggerType::RequestHousingLandInventory:
+    case ClientTriggerType::RequestLandInventory:
     {
       if( param2 != 1 )
         return;
@@ -436,7 +436,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
 
       break;
     }
-    case ClientTriggerType::RequestHousingEstateInventory:
+    case ClientTriggerType::RequestEstateInventory:
     {
       // only sent if param1 is 1, because the client sends this with 0 when you open the ui for whatever reason
       if( param1 != 1 )