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

WiP Fixed exiting house

Browse source
This commit is contained in:
Mordred 2023-01-26 22:39:50 +01:00
parent 1af0b33807
commit cc0a7aa70a
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/scripts/common/eobj/HousingEstateEntrance.cpp
View file

@ -6,7 +6,6 @@
#include "Territory/HousingZone.h" #include "Territory/HousingZone.h"
#include "Manager/TerritoryMgr.h" #include "Manager/TerritoryMgr.h"
#include "Manager/PlayerMgr.h" #include "Manager/PlayerMgr.h"
#include <Manager/WarpMgr.h>
#include "Territory/Land.h" #include "Territory/Land.h"
@ -37,9 +36,9 @@ public:
if( !zone ) if( !zone )
return; return;
Common::LandIdent ident; Common::LandIdent ident{};
ident.landId = eobj.getHousingLink(); ident.landId = static_cast< int16_t >( eobj.getHousingLink() );
ident.territoryTypeId = zone->getTerritoryTypeId(); ident.territoryTypeId = static_cast< int16_t >( zone->getTerritoryTypeId() );
ident.wardNum = zone->getWardNum(); ident.wardNum = zone->getWardNum();
ident.worldId = 67; ident.worldId = 67;
@ -55,7 +54,7 @@ public:
eventMgr().eventFinish( player, result.eventId, 1 ); eventMgr().eventFinish( player, result.eventId, 1 );
Common::FFXIVARR_POSITION3 pos {}; Common::FFXIVARR_POSITION3 pos;
auto land = zone->getLand( eobj.getHousingLink() >> 8 ); auto land = zone->getLand( eobj.getHousingLink() >> 8 );
if( !land ) if( !land )

2
src/world/Actor/Player.cpp
View file

@ -2135,7 +2135,7 @@ void Player::updatePrevTerritory()
{ {
auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref(); auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref();
if( teriMgr.isDefaultTerritory( getTerritoryTypeId() ) ) if( teriMgr.isDefaultTerritory( getTerritoryTypeId() ) || teriMgr.isHousingTerritory( getTerritoryTypeId() ) )
{ {
m_prevTerritoryTypeId = getTerritoryTypeId(); m_prevTerritoryTypeId = getTerritoryTypeId();
m_prevTerritoryId = getTerritoryId(); m_prevTerritoryId = getTerritoryId();