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

Revert "let global effect counter starts at 1 so the first status in each zone is not ignored by the client"

Browse source 
real problem is global seq field shifted
This commit is contained in:
collett 2024-06-12 08:45:43 +09:00
parent 46295cc7dd
commit 8387f00381
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -443,8 +443,8 @@ namespace Sapphire::Network::Packets::Server
*/ */
struct FFXIVIpcEffectResult : FFXIVIpcBasePacket< EffectResult > struct FFXIVIpcEffectResult : FFXIVIpcBasePacket< EffectResult >
{ {
uint32_t globalSequence;
uint32_t unknown1; uint32_t unknown1;
uint32_t globalSequence;
uint32_t actor_id; uint32_t actor_id;
uint32_t current_hp; uint32_t current_hp;
uint32_t max_hp; uint32_t max_hp;

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

@ -535,6 +535,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() ); auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() );
statusEffectAdd->data().unknown1 = 1;
statusEffectAdd->data().globalSequence = getCurrentTerritory()->getNextEffectSequence(); statusEffectAdd->data().globalSequence = getCurrentTerritory()->getNextEffectSequence();
statusEffectAdd->data().actor_id = pEffect->getTargetActorId(); statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
statusEffectAdd->data().current_hp = getHp(); statusEffectAdd->data().current_hp = getHp();

6
src/world/Territory/Territory.cpp
View file

@ -62,8 +62,7 @@ Sapphire::Territory::Territory() :
m_weatherOverride( Weather::None ), m_weatherOverride( Weather::None ),
m_lastMobUpdate( 0 ), m_lastMobUpdate( 0 ),
m_nextEObjId( 0x400D0000 ), m_nextEObjId( 0x400D0000 ),
m_nextActorId( 0x500D0000 ), m_nextActorId( 0x500D0000 )
m_effectCounter( 1 )
{ {
} }
@ -73,8 +72,7 @@ Sapphire::Territory::Territory( uint16_t territoryTypeId, uint32_t guId,
m_nextEObjId( 0x400D0000 ), m_nextEObjId( 0x400D0000 ),
m_nextActorId( 0x500D0000 ), m_nextActorId( 0x500D0000 ),
m_lastUpdate( 0 ), m_lastUpdate( 0 ),
m_lastActivityTime( Util::getTimeMs() ), m_lastActivityTime( Util::getTimeMs() )
m_effectCounter( 1 )
{ {
auto& exdData = Common::Service< Data::ExdDataGenerated >::ref(); auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
m_guId = guId; m_guId = guId;