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

hack to get aetheryte working again until the service is fixed.

Browse source
This commit is contained in:
collett 2020-04-12 23:54:34 +09:00
parent 058313e230
commit d10347bfff
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/scripts/common/aethernet/Aetheryte.cpp
View file

@ -108,7 +108,8 @@ public:
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref(); //auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
auto& exdData = *reinterpret_cast< Sapphire::Data::ExdDataGenerated* >( player.getExdData() );
auto aetherInfo = exdData.get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF ); auto aetherInfo = exdData.get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
if( !aetherInfo ) if( !aetherInfo )

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

@ -2497,3 +2497,8 @@ bool Sapphire::Entity::Player::gaugeSamHasAnySen()
{ {
return static_cast< uint8_t >( m_gauge.sam.sen ) > 0; return static_cast< uint8_t >( m_gauge.sam.sen ) > 0;
} }
void* Sapphire::Entity::Player::getExdData()
{
return &Common::Service< Data::ExdDataGenerated >::ref();
}

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

@ -1016,6 +1016,8 @@ namespace Sapphire::Entity
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
void* getExdData();
Common::HuntingLogEntry& getHuntingLogEntry( uint8_t index ); Common::HuntingLogEntry& getHuntingLogEntry( uint8_t index );
void sendHuntingLog(); void sendHuntingLog();