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

Fixed error with ward reading during house actions, lower case enum entries

Browse source
This commit is contained in:
Mordred 2018-11-28 20:32:05 +01:00
parent 5fe4155718
commit 2c69d7a22e
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/Common.h
View file

@ -776,8 +776,8 @@ namespace Core::Common
enum LandFlags : uint32_t enum LandFlags : uint32_t
{ {
ESTATE_BUILT = 0x1, EstateBuilt = 0x1,
ESTATE_HAS_AETHERYTE = 0x2, HasAetheryte = 0x2,
UNKNOWN_1 = 0x4, UNKNOWN_1 = 0x4,
UNKNOWN_2 = 0x8, UNKNOWN_2 = 0x8,
UNKNOWN_3 = 0x10, UNKNOWN_3 = 0x10,

4
src/servers/sapphire_zone/Actor/Player.cpp
View file

@ -1597,10 +1597,10 @@ void Core::Entity::Player::sendZonePackets()
if( pLand->getHouse() ) if( pLand->getHouse() )
{ {
state |= ESTATE_BUILT; state |= EstateBuilt;
// todo: remove this, debug for now // todo: remove this, debug for now
state |= ESTATE_HAS_AETHERYTE; state |= HasAetheryte;
} }
setLandFlags( LandFlagsSlot::Private, state, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() ); setLandFlags( LandFlagsSlot::Private, state, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() );

6
src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -365,7 +365,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
uint16_t territoryTypeId = param11 & 0xFFFF; uint16_t territoryTypeId = param11 & 0xFFFF;
uint16_t worldId = param11 >> 16; uint16_t worldId = param11 >> 16;
uint8_t ward = ( param12 & 0xFF00 ) >> 8; uint8_t ward = ( param12 >> 16 ) & 0xFF;
uint8_t plot = ( param12 & 0xFF ); uint8_t plot = ( param12 & 0xFF );
auto pHousingMgr = g_fw.get< HousingMgr >(); auto pHousingMgr = g_fw.get< HousingMgr >();
@ -381,7 +381,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
uint16_t territoryTypeId = param11 & 0xFFFF; uint16_t territoryTypeId = param11 & 0xFFFF;
uint16_t worldId = param11 >> 16; uint16_t worldId = param11 >> 16;
uint8_t ward = ( param12 & 0xFF00 ) >> 8; uint8_t ward = ( param12 >> 16 ) & 0xFF;
uint8_t plot = ( param12 & 0xFF ); uint8_t plot = ( param12 & 0xFF );
auto pHousingMgr = g_fw.get< HousingMgr >(); auto pHousingMgr = g_fw.get< HousingMgr >();
@ -397,7 +397,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
uint16_t territoryTypeId = param11 & 0xFFFF; uint16_t territoryTypeId = param11 & 0xFFFF;
uint16_t worldId = param11 >> 16; uint16_t worldId = param11 >> 16;
uint8_t ward = ( param12 & 0xFF00 ) >> 8; uint8_t ward = ( param12 >> 16 ) & 0xFF;
uint8_t plot = ( param12 & 0xFF ); uint8_t plot = ( param12 & 0xFF );
auto pHousingMgr = g_fw.get< HousingMgr >(); auto pHousingMgr = g_fw.get< HousingMgr >();

2
src/servers/sapphire_zone/Zone/HousingMgr.cpp
View file

@ -319,7 +319,7 @@ void Core::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNu
// todo: wtf are these flags // todo: wtf are these flags
player.playScene( 0x000B0095, 0, 4164955899, 0, 1, plotNum, nullptr ); player.playScene( 0x000B0095, 0, 4164955899, 0, 1, plotNum, nullptr );
player.setLandFlags( LandFlagsSlot::Private, ESTATE_BUILT, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() ); player.setLandFlags( LandFlagsSlot::Private, EstateBuilt, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() );
player.sendLandFlagsSlot( LandFlagsSlot::Private ); player.sendLandFlagsSlot( LandFlagsSlot::Private );
} }