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

Fix status effect list packet.

Browse source
This commit is contained in:
collett 2020-01-16 19:44:28 +09:00
parent 71d486e806
commit bb350ba250
5 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Common.h
View file

@ -412,7 +412,7 @@ namespace Sapphire::Common
struct StatusEffect struct StatusEffect
{ {
uint16_t effect_id; uint16_t effect_id;
uint16_t unknown1; uint16_t param;
float duration; float duration;
uint32_t sourceActorId; uint32_t sourceActorId;
}; };

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

@ -659,6 +659,7 @@ void Sapphire::Entity::Chara::sendStatusEffectUpdate()
( currentTimeMs - statusEffect->getStartTimeMs() ) ) / 1000; ( currentTimeMs - statusEffect->getStartTimeMs() ) ) / 1000;
statusEffectList->data().effect[ slot ].duration = timeLeft; statusEffectList->data().effect[ slot ].duration = timeLeft;
statusEffectList->data().effect[ slot ].effect_id = statusEffect->getId(); statusEffectList->data().effect[ slot ].effect_id = statusEffect->getId();
statusEffectList->data().effect[ slot ].param = statusEffect->getParam();
statusEffectList->data().effect[ slot ].sourceActorId = statusEffect->getSrcActorId(); statusEffectList->data().effect[ slot ].sourceActorId = statusEffect->getSrcActorId();
slot++; slot++;
} }

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

@ -744,16 +744,7 @@ void Sapphire::Entity::Player::gainLevel()
m_hp = getMaxHp(); m_hp = getMaxHp();
m_mp = getMaxMp(); m_mp = getMaxMp();
auto effectListPacket = makeZonePacket< FFXIVIpcStatusEffectList >( getId() ); sendStatusEffectUpdate();
effectListPacket->data().classId = static_cast< uint8_t > ( getClass() );
effectListPacket->data().level1 = getLevel();
effectListPacket->data().level = getLevel();
effectListPacket->data().current_hp = getMaxHp();
effectListPacket->data().current_mp = getMaxMp();
effectListPacket->data().currentTp = 1000;
effectListPacket->data().max_hp = getMaxHp();
effectListPacket->data().max_mp = getMaxMp();
sendToInRangeSet( effectListPacket, true );
sendToInRangeSet( makeActorControl( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ), sendToInRangeSet( makeActorControl( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ),
getLevel(), getLevel() - 1 ), true ); getLevel(), getLevel() - 1 ), true );

2
src/world/Network/PacketWrappers/NpcSpawnPacket.h
View file

@ -96,7 +96,7 @@ namespace Sapphire::Network::Packets::Server
( currentTimeMs - ( currentTimeMs -
effect.second->getStartTimeMs() ) ) / 1000; effect.second->getStartTimeMs() ) ) / 1000;
m_data.effect[ effect.first ].sourceActorId = effect.second->getSrcActorId(); m_data.effect[ effect.first ].sourceActorId = effect.second->getSrcActorId();
m_data.effect[ effect.first ].unknown1 = effect.second->getParam(); m_data.effect[ effect.first ].param = effect.second->getParam();
} }
}; };

2
src/world/Network/PacketWrappers/PlayerSpawnPacket.h
View file

@ -142,7 +142,7 @@ namespace Sapphire::Network::Packets::Server
( currentTimeMs - ( currentTimeMs -
effect.second->getStartTimeMs() ) ) / 1000; effect.second->getStartTimeMs() ) ) / 1000;
m_data.effect[ effect.first ].sourceActorId = effect.second->getSrcActorId(); m_data.effect[ effect.first ].sourceActorId = effect.second->getSrcActorId();
m_data.effect[ effect.first ].unknown1 = effect.second->getParam(); m_data.effect[ effect.first ].param = effect.second->getParam();
} }
}; };