instance player binding done, minor refactoring

src/servers/sapphire_zone/Zone/InstanceContent.cpp

@@ -27,19 +27,19 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent,
+Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > instanceConfiguration,
                                         uint32_t guId,
                                         const std::string& internalName,
                                         const std::string& contentName,
                                         uint32_t instanceContentId )
-   : Zone( static_cast< uint16_t >( pInstanceContent->territoryType ), guId, internalName, contentName ),
+   : Zone( static_cast< uint16_t >( instanceConfiguration->territoryType ), guId, internalName, contentName ),
      Director( Event::Director::InstanceContent, instanceContentId ),
-     m_instanceContentInfo( pInstanceContent ),
+     m_instanceConfiguration( instanceConfiguration ),
      m_instanceContentId( instanceContentId ),
      m_state( Created ),
      m_pEntranceEObj( nullptr ),
      m_instanceCommenceTime( 0 ),
-     m_currentBgm( pInstanceContent->bGM )
+     m_currentBgm( instanceConfiguration->bGM )
 {
 
 }
@@ -63,15 +63,15 @@ uint32_t Core::InstanceContent::getInstanceContentId() const
    return m_instanceContentId;
 }
 
-Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInstanceContentInfo() const
+Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInstanceConfiguration() const
 {
-   return m_instanceContentInfo;
+   return m_instanceConfiguration;
 }
 
 void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 {
    auto pLog = g_fw.get< Logger >();
-   pLog->debug( "InstanceContent::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|"
+   pLog->debug( "InstanceContent::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
                                                            + ", Entity#" + std::to_string( player.getId() ) );
 
@@ -100,11 +100,6 @@ void Core::InstanceContent::onLeaveTerritory( Entity::Player& player )
 
 void Core::InstanceContent::onUpdate( uint32_t currTime )
 {
-
-
-   // TODO: check all players if still bound, if not, remove
-   //       needs to happen regardless of state
-
    switch( m_state )
    {
       case Created:
@@ -113,13 +108,17 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
          if( m_playerMap.size() < 1 )
             return;
 
-         // TODO: 1. check all bound players instead of just players in instance at the time
          for( const auto& playerIt : m_playerMap )
          {
-            if( !playerIt.second->isLoadingComplete() ||
+            const auto& player = playerIt.second;
-                !playerIt.second->isDirectorInitialized() ||
+
-                !playerIt.second->isOnEnterEventDone() ||
+            if( !isPlayerBound( player->getId() ) )
-                playerIt.second->hasStateFlag( PlayerStateFlag::WatchingCutscene ) )
+               continue;
+
+            if( !player->isLoadingComplete() ||
+                !player->isDirectorInitialized() ||
+                !player->isOnEnterEventDone() ||
+                player->hasStateFlag( PlayerStateFlag::WatchingCutscene ) )
                return;
          }
 
@@ -136,13 +135,13 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
             auto pPlayer = playerIt.second;
             pPlayer->queuePacket(
                     ActorControlPacket143( pPlayer->getId(), DirectorUpdate,
-                                           getDirectorId(), 0x40000001, m_instanceContentInfo->timeLimitmin * 60u ) );
+                                           getDirectorId(), 0x40000001, m_instanceConfiguration->timeLimitmin * 60u ) );
          }
 
          if( m_pEntranceEObj )
             m_pEntranceEObj->setState( 7 );
          m_state = DutyInProgress;
-         m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceContentInfo->timeLimitmin * 60u );
+         m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceConfiguration->timeLimitmin * 60u );
          break;
       }
 
@@ -159,9 +158,9 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
       case DutyFinished:
          break;
    }
+
    auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    pScriptMgr->onInstanceUpdate( getAsInstanceContent(), currTime );
-
 }
 
 void Core::InstanceContent::onFinishLoading( Entity::Player& player )
@@ -338,6 +337,10 @@ Core::InstanceContent::InstanceContentState Core::InstanceContent::getState() co
 
 void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player )
 {
+   // remove any players from the instance who aren't bound on zone in
+   if( !isPlayerBound( player.getId() ) )
+      player.exitInstance();
+
    // if a player has already spawned once inside this instance, don't move them if they happen to zone in again
    if( !hasPlayerPreviouslySpawned( player ) )
    {
@@ -411,6 +414,11 @@ void Core::InstanceContent::setCurrentBGM( uint16_t bgmIndex )
    }
 }
 
+void Core::InstanceContent::setPlayerBGM( Core::Entity::Player& player, uint16_t bgmId )
+{
+   player.queuePacket( ActorControlPacket143( player.getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmId ) );
+}
+
 uint16_t Core::InstanceContent::getCurrentBGM() const
 {
    return m_currentBgm;
@@ -438,4 +446,8 @@ bool Core::InstanceContent::isPlayerBound( uint32_t playerId ) const
 void Core::InstanceContent::unbindPlayer( uint32_t playerId )
 {
    m_boundPlayerIds.erase( playerId );
+
+   auto it = m_playerMap.find( playerId );
+   if( it != m_playerMap.end() )
+      it->second->exitInstance();
 }

src/servers/sapphire_zone/Zone/InstanceContent.h

@@ -22,7 +22,7 @@ public:
       DutyFinished
    };
 
-   InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent,
+   InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > instanceConfiguration,
                     uint32_t guId,
                     const std::string& internalName,
                     const std::string& contentName,
@@ -51,14 +51,16 @@ public:
    void endEventCutscene();
 
    /*! set the current bgm index (inside bgm.exd) */
-   void setCurrentBGM( uint16_t bgmIndex );
+   void setCurrentBGM( uint16_t bgmId );
+   /*! set the current bgm for a specific player */
+   void setPlayerBGM( Entity::Player& player, uint16_t bgmId );
    /*! get the currently playing bgm index */
    uint16_t getCurrentBGM() const;
 
-   bool hasPlayerPreviouslySpawned( Entity::Player &player ) const;
+   bool hasPlayerPreviouslySpawned( Entity::Player& player ) const;
    InstanceContentState getState() const;
 
-   boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const;
+   boost::shared_ptr< Core::Data::InstanceContent > getInstanceConfiguration() const;
 
    uint32_t getInstanceContentId() const;
 
@@ -77,7 +79,7 @@ public:
    const uint32_t instanceStartDelay = 1250;
 
 private:
-   boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;
+   boost::shared_ptr< Core::Data::InstanceContent > m_instanceConfiguration;
    uint32_t m_instanceContentId;
    InstanceContentState m_state;
    uint16_t m_currentBgm;