From 0d6a0719de275691ab49ab5dc5203ecceae4cd7c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sat, 21 Jan 2023 07:09:00 +0900
Subject: [PATCH] fix quest battles which are using InstanceContent instead of
 QuestBattle.

---
 src/world/Manager/TerritoryMgr.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 0b46881b..9df18782 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -788,7 +788,14 @@ void Sapphire::World::Manager::TerritoryMgr::createAndJoinQuestBattle( Entity::P
 {
   auto qb = createQuestBattle( questBattleId );
   if( !qb )
-    return;
+  {
+    auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+    auto instanceInfo = exdData.get< Sapphire::Data::InstanceContent >( questBattleId );
+    if( !instanceInfo )
+      return;
+    qb = createInstanceContent( instanceInfo->order );
+    qb->getAsInstanceContent()->bindPlayer( player.getId() );
+  }
 
   player.setInstance( qb );