Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-29 07:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(skills): end a dead caster's skill when a client reports it (CasterDead)

Browse Source 
When a client gets EchoStartSkill (or SyncSkill) from a caster it sees
as dead, aimed at another object, it logs "msgEchoStartSkill
msgCasterDead" and sends CasterDead (120: optional i64Caster, optional
uiSkillHandle) through that target
(LWOSkillComponent::msgEchoStartSkill 0x00d5dc90). 303 live packets, the
target nearly always the attacked player, the caster a spawned enemy;
the next messages were mostly Die and SetStunned for the player. DLU
dropped it.

The server now ends that skill on the caster: its behaviors with that
handle are dropped (end entries run, pending timers and syncs discarded,
its projectiles removed), so a hit an enemy scheduled before dying does
not land later. It only does so when the server also sees the caster as
dead, so a client can't cancel a living enemy's attack. What live did
with the message is inferred from the name and when it was sent.

Check in game: kill an enemy in the middle of a slow or charged attack
(e.g. a Maelstrom horseman or a spider queen add): its attack does not
hit after it has died, and other enemies' attacks still hit normally.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-29 03:13:56 -05:00
parent 8d4422fa5c
commit dd116b9794
6 changed files with 104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dGame/dGameMessages/GameMessageHandler.cpp
View File

@@ -169,6 +169,7 @@ namespace {
{ SELECT_SKILL, []() { return std::make_unique<SelectSkill>(); } },
{ START_SKILL, []() { return std::make_unique<StartSkill>(); } },
{ SYNC_SKILL, []() { return std::make_unique<SyncSkill>(); } },
{ CASTER_DEAD, []() { return std::make_unique<CasterDead>(); } },
{ REQUEST_SERVER_PROJECTILE_IMPACT, []() { return std::make_unique<RequestServerProjectileImpact>(); } },
// Combat

22
dGame/dGameMessages/SkillMessages.cpp
View File

@@ -8,6 +8,7 @@
#include "dServer.h"
#include "eMissionTaskType.h"
#include "Entity.h"
#include "EntityManager.h"
#include "Game.h"
#include "InventoryComponent.h"
#include "MissionComponent.h"
@@ -57,6 +58,27 @@ namespace GameMessages {
return true;
}
void CasterDead::Serialize(RakNet::BitStream& bitStream) const {
BitStreamUtils::WriteOptional(bitStream, i64Caster, LWOOBJID_EMPTY);
BitStreamUtils::WriteOptional(bitStream, uiSkillHandle, 0u);
}
bool CasterDead::Deserialize(RakNet::BitStream& bitStream) {
VALIDATE_READ(BitStreamUtils::ReadOptional(bitStream, i64Caster, LWOOBJID_EMPTY));
VALIDATE_READ(BitStreamUtils::ReadOptional(bitStream, uiSkillHandle, 0u));
return true;
}
void CasterDead::Handle(Entity& entity, const SystemAddress& sysAddr) {
// Only for a caster the server also sees as dead: a client can't cancel a living enemy's attack
auto* const caster = Game::entityManager->GetEntity(i64Caster);
if (!caster) return;
const auto* const destroyable = caster->GetComponent<DestroyableComponent>();
if (!destroyable || !destroyable->GetIsDead()) return;
auto* const skillComponent = caster->GetComponent<SkillComponent>();
if (skillComponent) skillComponent->EndSkill(uiSkillHandle);
}
void SelectSkill::Serialize(RakNet::BitStream& bitStream) const {
bitStream.Write(bFromSkillSet);
bitStream.Write(skillID);

13
dGame/dGameMessages/SkillMessages.h
View File

@@ -49,6 +49,19 @@ namespace GameMessages {
int32_t skillID{};
};
// Client -> server. A client got EchoStartSkill (or SyncSkill) from a caster it sees as dead, aimed at another
// object (LWOSkillComponent::msgEchoStartSkill 0x00d5dc90), and tells the server through that target object.
// The server ends the caster's skill with that handle if the caster is dead there too.
struct CasterDead : public NetGameMsg {
CasterDead() : NetGameMsg(MessageType::Game::CASTER_DEAD) {}
void Serialize(RakNet::BitStream& bitStream) const override;
bool Deserialize(RakNet::BitStream& bitStream) override;
void Handle(Entity& entity, const SystemAddress& sysAddr) override;
LWOOBJID i64Caster{ LWOOBJID_EMPTY }; // optional
uint32_t uiSkillHandle{}; // optional
};
// Client -> server. The player picked a skill; DLU only uses it to fix invisible items on first load.
struct SelectSkill : public NetGameMsg {
SelectSkill() : NetGameMsg(MessageType::Game::SELECT_SKILL) {}