From 6a7261a22b62625fcf930a7e39af378310b8fe27 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 21 Jan 2023 22:27:24 +0100
Subject: [PATCH] Instance content debug command fix, instance cr now takes the
 contentfindercondition id

---
 deps/datReader/Exd/Structs.h       | 11 ++++++++++-
 src/world/Manager/TerritoryMgr.cpp |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h
index 7ae015af..dc464068 100644
--- a/deps/datReader/Exd/Structs.h
+++ b/deps/datReader/Exd/Structs.h
@@ -207,7 +207,7 @@ namespace Excel
   struct ContentFinderCondition
   {
     uint16_t InstanceContentId;
-    uint8_t ItemLevel;
+    uint16_t ItemLevel;
     uint8_t Unknown;
     uint8_t RandomContentType;
     uint8_t FinderPartyCondition;
@@ -242,6 +242,13 @@ namespace Excel
     uint8_t Unknown20 : 1;
     uint8_t Unknown21 : 1;
     uint8_t Unknown22 : 1;
+    uint8_t Unknown23;
+    uint8_t Unknown24;
+    uint8_t Unknown25;
+    uint8_t Unknown26;
+    uint8_t Unknown27;
+    uint8_t Unknown28;
+
 
 
   };
@@ -261,6 +268,8 @@ namespace Excel
     uint8_t Unknown4 : 1;
     uint8_t Unknown5 : 1;
     uint8_t padding : 5;
+    uint8_t Unknown6;
+    uint8_t Unknown7;
   };
 
   /* 63505 */
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 7449aa85..43bfa578 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -363,7 +363,7 @@ TerritoryPtr TerritoryMgr::createInstanceContent( uint32_t contentFinderId )
 
   auto pTeri = getTerritoryDetail( instanceContentData.TerritoryType );
 
-  auto name = pContentFinderCondition->getString( instanceContentData.Text.Name );
+  auto name = pInstanceContent->getString( instanceContentData.Text.Name );
 
   if( !pTeri || name.empty() )
     return nullptr;