diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp index 16908f83..bc176fb4 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp @@ -10,10 +10,10 @@ public: void onInit( InstanceContent& instance ) override { auto exit = new Entity::EventObject( EXIT_OBJECT, 0, { 0, 0, -10 } ); - instance.registerEObj(Entity::InstanceObjectPtr(exit)); + instance.registerEObj(Entity::EventObjectPtr(exit)); auto start = new Entity::EventObject( START_CIRCLE, 4236868, { 0, 0, 24 } ); - instance.registerEObj(Entity::InstanceObjectPtr(start)); + instance.registerEObj(Entity::EventObjectPtr(start)); } void onUpdate( InstanceContent& instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp index 87f0e5a9..22c384e6 100644 --- a/src/servers/sapphire_zone/Zone/Zone.cpp +++ b/src/servers/sapphire_zone/Zone/Zone.cpp @@ -805,15 +805,15 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object ) //object->setParentInstance( InstanceContentPtr( this ) ); - m_instanceObjects[object->getId()] = object; + m_eventObjects[object->getId()] = object; g_log.debug( "Registered instance eobj: " + std::to_string( object->getId() ) ); } Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId ) { - auto obj = m_instanceObjects.find( objId ); - if( obj == m_instanceObjects.end() ) + auto obj = m_eventObjects.find( objId ); + if( obj == m_eventObjects.end() ) return nullptr; return obj->second; diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h index 7f9f9ceb..1619cafc 100644 --- a/src/servers/sapphire_zone/Zone/Zone.h +++ b/src/servers/sapphire_zone/Zone/Zone.h @@ -35,7 +35,7 @@ protected: std::unordered_map< int32_t, Entity::PlayerPtr > m_playerMap; std::unordered_map< int32_t, Entity::BattleNpcPtr > m_BattleNpcMap; - std::unordered_map< int32_t, Entity::EventObjectPtr > m_instanceObjects; + std::unordered_map< int32_t, Entity::EventObjectPtr > m_eventObjects; std::set< Entity::BattleNpcPtr > m_BattleNpcDeadMap;