phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-23 07:40:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

fix(combatlog): preserve spellsteal in dispel log handler

Browse source
This commit is contained in:
Kelsi 2026-03-13 20:06:39 -07:00
parent c45951b368
commit 98c195fb8e
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/game/game_handler.cpp
View file

@ -6175,21 +6175,30 @@ void GameHandler::handlePacket(network::Packet& packet) {
}
// Show system message if player was victim or caster
if (victimGuid == playerGuid || casterGuid == playerGuid) {
const char* verb = isStolen ? "stolen" : "dispelled";
if (!firstSpellName.empty()) {
char buf[256];
if (victimGuid == playerGuid && casterGuid != playerGuid)
std::snprintf(buf, sizeof(buf), "%s was %s.", firstSpellName.c_str(), verb);
else if (casterGuid == playerGuid)
std::snprintf(buf, sizeof(buf), "You %s %s.", verb, firstSpellName.c_str());
else
std::snprintf(buf, sizeof(buf), "%s %s.", firstSpellName.c_str(), verb);
if (isStolen) {
if (victimGuid == playerGuid && casterGuid != playerGuid)
std::snprintf(buf, sizeof(buf), "%s was stolen.", firstSpellName.c_str());
else if (casterGuid == playerGuid)
std::snprintf(buf, sizeof(buf), "You steal %s.", firstSpellName.c_str());
else
std::snprintf(buf, sizeof(buf), "%s was stolen.", firstSpellName.c_str());
} else {
if (victimGuid == playerGuid && casterGuid != playerGuid)
std::snprintf(buf, sizeof(buf), "%s was dispelled.", firstSpellName.c_str());
else if (casterGuid == playerGuid)
std::snprintf(buf, sizeof(buf), "You dispel %s.", firstSpellName.c_str());
else
std::snprintf(buf, sizeof(buf), "%s was dispelled.", firstSpellName.c_str());
}
addSystemChatMessage(buf);
}
// Add dispel event to combat log
// Preserve stolen auras as spellsteal events so the log wording stays accurate.
if (firstDispelledId != 0) {
bool isPlayerCaster = (casterGuid == playerGuid);
addCombatText(CombatTextEntry::DISPEL, 0, firstDispelledId, isPlayerCaster, 0,
addCombatText(isStolen ? CombatTextEntry::STEAL : CombatTextEntry::DISPEL,
0, firstDispelledId, isPlayerCaster, 0,
casterGuid, victimGuid);
}
}