mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 13:47:46 +00:00
Code Activity

Fixed an issue where players were removed from the wrong zone

Browse source
This commit is contained in:
Mordred 2018-03-17 11:36:56 +01:00
parent a0bf531315
commit c92ee8b7cd
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/servers/sapphire_zone/Zone/InstanceContent.cpp
View file

@ -107,17 +107,13 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
if( m_boundPlayerIds.size() == 0 ) if( m_boundPlayerIds.size() == 0 )
return; return;
for( const auto playerId : m_boundPlayerIds ) for( auto playerId : m_boundPlayerIds )
{ {
auto it = m_playerMap.find( playerId ); auto it = m_playerMap.find( playerId );
if( it == m_playerMap.end() ) if( it == m_playerMap.end() )
return; return;
}
for( const auto& playerIt : m_playerMap )
{
const auto& player = playerIt.second;
auto player = it->second;
if( !player->isLoadingComplete() || if( !player->isLoadingComplete() ||
!player->isDirectorInitialized() || !player->isDirectorInitialized() ||
!player->isOnEnterEventDone() || !player->isOnEnterEventDone() ||

20
src/servers/sapphire_zone/Zone/Zone.cpp
View file

@ -226,19 +226,21 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
void Core::Zone::removeActor( Entity::ActorPtr pActor ) void Core::Zone::removeActor( Entity::ActorPtr pActor )
{ {
auto pCell = pActor->getCellPtr(); /* TODO: have to wait and see if removal of this actually breaks anything
if( pCell ) this however is potentially removing a player from a zone he does not belong to */
{ //auto pCell = pActor->getCellPtr();
pCell->removeActor( pActor ); //if( pCell )
pCell = nullptr; //{
} // pCell->removeActor( pActor );
// pCell = nullptr;
//}
if( pActor->isPlayer() ) if( pActor->isPlayer() )
{ {
// If it's a player and he's inside boundaries - update his nearby cells // If it's a player and he's inside boundaries - update his nearby cells
if( pActor->getPos().x <= _maxX && pActor->getPos().x >= _minX && if( pActor->getPos().x <= _maxX && pActor->getPos().x >= _minX &&
pActor->getPos().z <= _maxY && pActor->getPos().z >= _minY ) pActor->getPos().z <= _maxY && pActor->getPos().z >= _minY )
{ {
uint32_t x = getPosX( pActor->getPos().x ); uint32_t x = getPosX( pActor->getPos().x );
uint32_t y = getPosY( pActor->getPos().z ); uint32_t y = getPosY( pActor->getPos().z );
@ -539,7 +541,11 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
{ {
if( pOldCell ) if( pOldCell )
{
auto pLog = g_fw.get< Logger >();
pLog->debug( std::string( __FUNCTION__ ) + "removeActor" );
pOldCell->removeActor( actor.shared_from_this() ); pOldCell->removeActor( actor.shared_from_this() );
}
pCell->addActor( actor.shared_from_this() ); pCell->addActor( actor.shared_from_this() );
actor.setCell( pCell ); actor.setCell( pCell );