phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-03 16:03:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fire PLAYER_DEAD, PLAYER_ALIVE, and PLAYER_UNGHOST death events

Browse source 
PLAYER_DEAD only fired from SMSG_FORCED_DEATH_UPDATE (GM kill) — the
normal death path (health dropping to 0 via VALUES update) never fired
it. Death-related addons and the default release spirit dialog depend
on this event.

Also add PLAYER_ALIVE (fires when resurrected without having been a
ghost) and PLAYER_UNGHOST (fires when player rezzes from ghost form)
at the health-restored-from-zero VALUES path. These events control
the transition from ghost form back to alive, letting addons restore
normal UI state after death.
This commit is contained in:
Kelsi 2026-03-22 17:33:22 -07:00
parent 2a2db5cfb5
commit d00ebd00a0
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/game_handler.cpp
View file

@ -12515,6 +12515,8 @@ void GameHandler::applyUpdateObjectBlock(const UpdateBlock& block, bool& newItem
LOG_INFO("Player died! Corpse position cached at server=(", LOG_INFO("Player died! Corpse position cached at server=(",
corpseX_, ",", corpseY_, ",", corpseZ_, corpseX_, ",", corpseY_, ",", corpseZ_,
") map=", corpseMapId_); ") map=", corpseMapId_);
if (addonEventCallback_)
addonEventCallback_("PLAYER_DEAD", {});
} }
if ((entity->getType() == ObjectType::UNIT || entity->getType() == ObjectType::PLAYER) && npcDeathCallback_) { if ((entity->getType() == ObjectType::UNIT || entity->getType() == ObjectType::PLAYER) && npcDeathCallback_) {
npcDeathCallback_(block.guid); npcDeathCallback_(block.guid);
@ -12522,11 +12524,17 @@ void GameHandler::applyUpdateObjectBlock(const UpdateBlock& block, bool& newItem
} }
} else if (oldHealth == 0 && val > 0) { } else if (oldHealth == 0 && val > 0) {
if (block.guid == playerGuid) { if (block.guid == playerGuid) {
bool wasGhost = releasedSpirit_;
playerDead_ = false; playerDead_ = false;
if (!releasedSpirit_) { if (!wasGhost) {
LOG_INFO("Player resurrected!"); LOG_INFO("Player resurrected!");
if (addonEventCallback_)
addonEventCallback_("PLAYER_ALIVE", {});
} else { } else {
LOG_INFO("Player entered ghost form"); LOG_INFO("Player entered ghost form");
releasedSpirit_ = false;
if (addonEventCallback_)
addonEventCallback_("PLAYER_UNGHOST", {});
} }
} }
if ((entity->getType() == ObjectType::UNIT || entity->getType() == ObjectType::PLAYER) && npcRespawnCallback_) { if ((entity->getType() == ObjectType::UNIT || entity->getType() == ObjectType::PLAYER) && npcRespawnCallback_) {