From f16be26e4cf89bd63adc3be3cf93c38b84613700 Mon Sep 17 00:00:00 2001
From: liam <lmcintyre995@gmail.com>
Date: Sat, 23 Nov 2019 02:57:29 -0500
Subject: [PATCH] minor instance script fixes, eobj parser should work as well
 as produce usable scripts now

---
 src/tools/event_object_parser/instance.tmpl    | 2 +-
 src/tools/event_object_parser/main.cpp         | 2 +-
 src/tools/event_object_parser/questbattle.tmpl | 2 +-
 src/world/Manager/TerritoryMgr.cpp             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tools/event_object_parser/instance.tmpl b/src/tools/event_object_parser/instance.tmpl
index 18073304..c8188474 100644
--- a/src/tools/event_object_parser/instance.tmpl
+++ b/src/tools/event_object_parser/instance.tmpl
@@ -14,7 +14,7 @@ public:
 EOBJ_INIT
   }
 
-  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint64_t tickCount ) override
   {
 
   }
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index a4d451a9..d531797d 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -137,7 +137,7 @@ void loadAllInstanceContentEntries()
       if( !ic )
         continue;
       type = ic->instanceContentType;
-      name = ic->name;
+      name = cfc->name;
     }
     else if( cfc->contentLinkType == 5 )
     { 
diff --git a/src/tools/event_object_parser/questbattle.tmpl b/src/tools/event_object_parser/questbattle.tmpl
index cc161d97..9e7d968c 100644
--- a/src/tools/event_object_parser/questbattle.tmpl
+++ b/src/tools/event_object_parser/questbattle.tmpl
@@ -16,7 +16,7 @@ public:
 EOBJ_INIT
   }
 
-  void onUpdate( QuestBattle& instance, uint32_t currTime ) override
+  void onUpdate( QuestBattle& instance, uint64_t tickCount ) override
   {
 
   }
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 83b833e8..c649964e 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -345,13 +345,13 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceCon
 
   auto pTeri = getTerritoryDetail( pContentFinderCondition->territoryType );
 
-  if( !pTeri || pInstanceContent->name.empty() )
+  if( !pTeri || pContentFinderCondition->name.empty() )
     return nullptr;
 
   Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pInstanceContent->name );
 
   auto pZone = make_InstanceContent( pInstanceContent, pContentFinderCondition->territoryType, getNextInstanceId(),
-                                     pTeri->name, pInstanceContent->name, instanceContentId, framework() );
+                                       pTeri->name, pContentFinderCondition->name, instanceContentId, framework() );
   pZone->init();
 
   m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;