From eee27910ecae6f7493eaf358b313e78fa92809ae Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 11 Jan 2022 00:22:58 +0100 Subject: [PATCH] Missed one getCurrentTerri call. --- src/world/Action/EffectBuilder.cpp | 3 +-- src/world/Manager/DebugCommandMgr.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp index b0a9dbbd..34e5f11e 100644 --- a/src/world/Action/EffectBuilder.cpp +++ b/src/world/Action/EffectBuilder.cpp @@ -123,10 +123,9 @@ void EffectBuilder::buildAndSendPackets( const std::vector< Entity::CharaPtr >& std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( const std::vector< Entity::CharaPtr >& targetList ) { auto remainingTargetCount = targetList.size(); - auto globalSequence = m_sourceChara->getCurrentTerritory()->getNextEffectSequence(); - auto& teriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); auto zone = teriMgr.getZoneByTerritoryTypeId( m_sourceChara->getTerritoryTypeId() ); + auto globalSequence = zone->getNextEffectSequence(); if( remainingTargetCount > 1 ) // use AoeEffect packets { diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index db055b18..145075fb 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -1277,7 +1277,7 @@ void Sapphire::World::Manager::DebugCommandMgr::housing( char* data, Entity::Pla // // if ( permissionSet < 5 ) // { -// auto pZone = player.getCurrentTerritory(); +// auto pZone = teriMgr.getTerritoryFromGuid( player.getTerritoryId() ); // if( terriMgr.isHousingTerritory( pZone->getTerritoryTypeId() ) ) // { // auto pHousing = std::dynamic_pointer_cast< HousingZone >( pZone );