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

Merge branch 'housing' of https://github.com/SapphireMordred/Sapphire into housing

Browse source
This commit is contained in:
mordred 2018-11-23 15:03:04 +01:00
commit c317fb13e7
6 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/update.sql
View file

@ -19,12 +19,6 @@ MODIFY COLUMN UPDATE_DATE DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURR
ALTER TABLE charainfosearch
MODIFY COLUMN UPDATE_DATE DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE charaitemcrystal
MODIFY COLUMN UPDATE_DATE DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE charaitemcurrency
MODIFY COLUMN UPDATE_DATE DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE charaitemgearset
MODIFY COLUMN UPDATE_DATE DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;

11
src/servers/sapphire_zone/Event/EventHelper.cpp
View file

@ -74,14 +74,19 @@ std::string Core::Event::getEventName( uint32_t eventId )
return "WarpTaxi";
return unknown + "ChocoboWarp"; //who know
}
case Event::EventHandler::EventHandlerType::Shop:
{
auto shopInfo = pExdData->get< Core::Data::GilShop >( eventId );
if( shopInfo )
return "GilShop" + std::to_string( eventId );
/*if( shopInfo )
{
if( shopInfo->name.empty() || shopInfo->name == " " )
return "GilShop" + std::to_string( eventId );
return shopInfo->name;
return unknown + "GilShop";
}*/
//return unknown + "GilShop";
}
default:
{

1
src/servers/sapphire_zone/Network/GameConnection.h
View file

@ -153,7 +153,6 @@ namespace Core::Network
DECLARE_HANDLER( cfDutyAccepted );
DECLARE_HANDLER( actionHandler );
DECLARE_HANDLER( gm1Handler );

5
src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
View file

@ -265,16 +265,15 @@ void Core::Network::GameConnection::eventHandlerShop( const Packets::FFXIVARR_PA
auto eventType = static_cast< uint16_t >( eventId >> 16 );
std::string eventName = "onShop";
std::string eventName = "onOpen";
std::string objName = Event::getEventName( eventId );
player.sendDebug( "EventId: " +
std::to_string( eventId ) +
" (0x" + Util::intToHexString( static_cast< uint64_t >( eventId & 0xFFFFFFF ), 8 ) + ")" );
player.sendDebug( "Calling: " + objName + "." + eventName );
player.eventStart( 0, eventId, Event::EventHandler::UI, 0, 0 );
player.eventStart( 0, eventId, Event::EventHandler::UI, 0, packet.data().param );
}

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

@ -240,8 +240,13 @@ void Core::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId,
auto& entry = wardInfoPacket->data().houseInfoEntry[ i ];
// retail always sends the house price in this packet, even after the house has been sold
// so I guess we do the same
entry.housePrice = land->getCurrentPrice();
if( land->getState() == Common::HouseState::forSale )
continue;
switch( land->getLandType() )
{
case LandType::FreeCompany:

4
src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
View file

@ -413,6 +413,10 @@ bool Core::TerritoryMgr::movePlayer( ZonePtr pZone, Core::Entity::PlayerPtr pPla
if( pHousing )
pPlayer->setTerritoryId( pHousing->getLandSetId() );
}
else if( isInstanceContentTerritory( pZone->getTerritoryTypeId() ) )
{
pPlayer->setTerritoryId( pZone->getGuId() );
}
else
{
pPlayer->setTerritoryId( 0 );