diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp index 06e04cc2..8dcd2f4a 100644 --- a/src/world/Script/NativeScriptApi.cpp +++ b/src/world/Script/NativeScriptApi.cpp @@ -177,15 +177,15 @@ namespace Sapphire::ScriptAPI { } - void InstanceContentScript::onInit( InstanceContentPtr instance ) + void InstanceContentScript::onInit( InstanceContent& instance ) { } - void InstanceContentScript::onUpdate( InstanceContentPtr instance, uint32_t currTime ) + void InstanceContentScript::onUpdate( InstanceContent& instance, uint32_t currTime ) { } - void InstanceContentScript::onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, + void InstanceContentScript::onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { } diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h index a86a8c63..486bb74e 100644 --- a/src/world/Script/NativeScriptApi.h +++ b/src/world/Script/NativeScriptApi.h @@ -221,11 +221,11 @@ namespace Sapphire::ScriptAPI public: explicit InstanceContentScript( uint32_t instanceContentId ); - virtual void onInit( Sapphire::InstanceContentPtr instance ); + virtual void onInit( Sapphire::InstanceContent& instance ); - virtual void onUpdate( Sapphire::InstanceContentPtr instance, uint32_t currTime ); + virtual void onUpdate( Sapphire::InstanceContent& instance, uint32_t currTime ); - virtual void onEnterTerritory( Sapphire::InstanceContentPtr instance, Sapphire::Entity::Player& player, uint32_t eventId, + virtual void onEnterTerritory( Sapphire::InstanceContent& instance, Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); }; diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp index e5c59236..a066484c 100644 --- a/src/world/Script/ScriptMgr.cpp +++ b/src/world/Script/ScriptMgr.cpp @@ -371,7 +371,7 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); if( script ) { - script->onInit( instance ); + script->onInit( *instance ); return true; } @@ -384,7 +384,7 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instan if( script ) { - script->onUpdate( instance, currTime ); + script->onUpdate( *instance, currTime ); return true; } @@ -397,7 +397,7 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceEnterTerritory( InstanceContentPt auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); if( script ) { - script->onEnterTerritory( instance, player, eventId, param1, param2 ); + script->onEnterTerritory( *instance, player, eventId, param1, param2 ); return true; }