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

Missed one getCurrentTerri call.

Browse source
This commit is contained in:
Mordred 2022-01-11 00:22:58 +01:00
parent 1f1e761016
commit eee27910ec
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/world/Action/EffectBuilder.cpp
View file

@ -123,10 +123,9 @@ void EffectBuilder::buildAndSendPackets( const std::vector< Entity::CharaPtr >&
std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( const std::vector< Entity::CharaPtr >& targetList ) std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( const std::vector< Entity::CharaPtr >& targetList )
{ {
auto remainingTargetCount = targetList.size(); auto remainingTargetCount = targetList.size();
auto globalSequence = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
auto& teriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); auto& teriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
auto zone = teriMgr.getZoneByTerritoryTypeId( m_sourceChara->getTerritoryTypeId() ); auto zone = teriMgr.getZoneByTerritoryTypeId( m_sourceChara->getTerritoryTypeId() );
auto globalSequence = zone->getNextEffectSequence();
if( remainingTargetCount > 1 ) // use AoeEffect packets if( remainingTargetCount > 1 ) // use AoeEffect packets
{ {

2
src/world/Manager/DebugCommandMgr.cpp
View file

@ -1277,7 +1277,7 @@ void Sapphire::World::Manager::DebugCommandMgr::housing( char* data, Entity::Pla
// //
// if ( permissionSet < 5 ) // if ( permissionSet < 5 )
// { // {
// auto pZone = player.getCurrentTerritory(); // auto pZone = teriMgr.getTerritoryFromGuid( player.getTerritoryId() );
// if( terriMgr.isHousingTerritory( pZone->getTerritoryTypeId() ) ) // if( terriMgr.isHousingTerritory( pZone->getTerritoryTypeId() ) )
// { // {
// auto pHousing = std::dynamic_pointer_cast< HousingZone >( pZone ); // auto pHousing = std::dynamic_pointer_cast< HousingZone >( pZone );