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

Merge branch 'noprivatezones' into develop_5.5x

Browse source
This commit is contained in:
Rey 2021-08-14 15:09:01 -05:00
commit 326be15a1a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/world/Territory/Territory.cpp
View file

@ -314,8 +314,8 @@ void Sapphire::Territory::queuePacketForRange( Entity::Player& sourcePlayer, uin
Network::Packets::FFXIVPacketBasePtr pPacketEntry ) Network::Packets::FFXIVPacketBasePtr pPacketEntry )
{ {
auto& teriMgr = Common::Service< TerritoryMgr >::ref(); auto& teriMgr = Common::Service< TerritoryMgr >::ref();
if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) ) //if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) )
return; // return;
auto& serverMgr = Common::Service< World::ServerMgr >::ref(); auto& serverMgr = Common::Service< World::ServerMgr >::ref();
@ -341,8 +341,8 @@ void Sapphire::Territory::queuePacketForZone( Entity::Player& sourcePlayer,
bool forSelf ) bool forSelf )
{ {
auto& teriMgr = Common::Service< TerritoryMgr >::ref(); auto& teriMgr = Common::Service< TerritoryMgr >::ref();
if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) ) //if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) )
return; // return;
auto& serverMgr = Common::Service< World::ServerMgr >::ref(); auto& serverMgr = Common::Service< World::ServerMgr >::ref();
@ -686,8 +686,8 @@ void Sapphire::Territory::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell
auto& teriMgr = Common::Service< TerritoryMgr >::ref(); auto& teriMgr = Common::Service< TerritoryMgr >::ref();
// TODO: make sure gms can overwrite this. Potentially temporary solution // TODO: make sure gms can overwrite this. Potentially temporary solution
if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) ) //if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) )
return; // return;
auto iter = pCell->m_actors.begin(); auto iter = pCell->m_actors.begin();