1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 12:17:46 +00:00

Merge remote-tracking branch 'remotes/origin/develop' into develop_c

This commit is contained in:
collett 2020-01-20 16:56:58 +09:00
commit dff0033464
3 changed files with 3 additions and 3 deletions

View file

@ -652,7 +652,7 @@ namespace Sapphire::Common
enum class ActionEffectResultFlag : uint8_t enum class ActionEffectResultFlag : uint8_t
{ {
None = 0, None = 0,
Absorbed = 4, Absorbed = 0x04,
EffectOnSource = 0x80, EffectOnSource = 0x80,
Reflected = 0xA0, Reflected = 0xA0,
}; };

View file

@ -267,7 +267,7 @@ bool Lobby::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet,
} }
else else
{ {
Logger::info( "Could not retrieve session: {0}", std::string( ( char* ) &packet.data[ 0 ] + 0x20 ) ); Logger::info( "Could not retrieve session: {0}", std::string( ( char* ) &packet.data[ 0 ] + 0x22 ) );
sendError( 1, 5006, 13001, tmpId ); sendError( 1, 5006, 13001, tmpId );
return true; return true;

View file

@ -507,7 +507,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
statusEffectAdd->data().max_hp = getMaxHp(); statusEffectAdd->data().max_hp = getMaxHp();
statusEffectAdd->data().max_mp = static_cast< uint16_t >( getMaxMp() ); statusEffectAdd->data().max_mp = static_cast< uint16_t >( getMaxMp() );
statusEffectAdd->data().classId = static_cast< uint8_t >( getClass() ); statusEffectAdd->data().classId = static_cast< uint8_t >( getClass() );
statusEffectAdd->data().entryCount = 1; // todo: add multiple status but send only one result statusEffectAdd->data().entryCount = 1;
auto& status = statusEffectAdd->data().statusEntries[0]; auto& status = statusEffectAdd->data().statusEntries[0];