From e360dadb953137d342efce61a02ac2bd63ba04d4 Mon Sep 17 00:00:00 2001 From: collett Date: Mon, 13 Sep 2021 05:25:38 +0900 Subject: [PATCH] fix duty info remaining on client after leaving --- src/world/Territory/InstanceContent.cpp | 7 +------ src/world/Territory/PublicContent.cpp | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp index ad9e08fb..bd50e9bf 100644 --- a/src/world/Territory/InstanceContent.cpp +++ b/src/world/Territory/InstanceContent.cpp @@ -80,11 +80,7 @@ void Sapphire::InstanceContent::onPlayerZoneIn( Entity::Player& player ) // mark player as "bound by duty" player.setStateFlag( PlayerStateFlag::BoundByDuty ); - // if the instance was not started yet, director init is sent on enter event. - // else it will be sent on finish loading. - if( m_state == Created ) - sendDirectorInit( player ); - + sendDirectorInit( player ); } void Sapphire::InstanceContent::onLeaveTerritory( Entity::Player& player ) @@ -164,7 +160,6 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount ) void Sapphire::InstanceContent::onFinishLoading( Entity::Player& player ) { - sendDirectorInit( player ); } void Sapphire::InstanceContent::onInitDirector( Entity::Player& player ) diff --git a/src/world/Territory/PublicContent.cpp b/src/world/Territory/PublicContent.cpp index a74f15dd..8af58fd0 100644 --- a/src/world/Territory/PublicContent.cpp +++ b/src/world/Territory/PublicContent.cpp @@ -91,7 +91,6 @@ void Sapphire::PublicContent::onUpdate( uint64_t tickCount ) void Sapphire::PublicContent::onFinishLoading( Entity::Player& player ) { - sendDirectorInit( player ); } void Sapphire::PublicContent::onInitDirector( Entity::Player& player )