mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-07 11:17:46 +00:00
Code Activity

Merge pull request #727 from collett8192/patch

Browse source 
fix duty info remaining on client after leaving.
This commit is contained in:
Adam 2021-09-13 20:56:19 +10:00 • committed by GitHub
commit 067f3e6182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/world/Territory/InstanceContent.cpp
View file

@ -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 )

1
src/world/Territory/PublicContent.cpp
View file

@ -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 )