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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Common.h
View file

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

2
src/lobby/GameConnection.cpp
View file

@ -267,7 +267,7 @@ bool Lobby::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet,
}
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 );
return true;

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

@ -507,7 +507,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
statusEffectAdd->data().max_hp = getMaxHp();
statusEffectAdd->data().max_mp = static_cast< uint16_t >( getMaxMp() );
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];