From 681b38a2a5a1b2b6fd65f784f1e1c4997653f34b Mon Sep 17 00:00:00 2001 From: collett Date: Sun, 5 Jan 2020 16:44:45 +0900 Subject: [PATCH] globalSequence --- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +- src/world/Action/EffectBuilder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 65730d02..2cb79a26 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -584,7 +584,7 @@ namespace Sapphire::Network::Packets::Server uint64_t animationTargetId; // who the animation targets uint32_t actionId; // what the casting player casts, shown in battle log/ui - uint32_t globalEffectCounter; // seems to only increment on retail? + uint32_t globalSequence; // seems to only increment on retail? float animationLockTime; // maybe? doesn't seem to do anything uint32_t someTargetId; // always 00 00 00 E0, 0x0E000000 is the internal def for INVALID TARGET ID diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp index 27a35683..3573f3f7 100644 --- a/src/world/Action/EffectBuilder.cpp +++ b/src/world/Action/EffectBuilder.cpp @@ -193,7 +193,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_ pHeader->effectDisplayType = Common::ActionEffectDisplayType::ShowActionName; pHeader->effectCount = static_cast< uint8_t >( remainingTargetCount > packetSize ? packetSize : remainingTargetCount ); pHeader->sourceSequence = m_sequence; - pHeader->globalEffectCounter = globalSequence; + pHeader->globalSequence = globalSequence; uint8_t targetIndex = 0; for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); )