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

fix(combatlog): log all dispelled and stolen auras

Browse source
This commit is contained in:
Kelsi 2026-03-13 20:14:02 -07:00
parent 98c195fb8e
commit 3edf280e06
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/game/game_handler.cpp
View file

@ -6160,15 +6160,18 @@ void GameHandler::handlePacket(network::Packet& packet) {
/*uint32_t dispelSpell =*/ packet.readUInt32(); /*uint32_t dispelSpell =*/ packet.readUInt32();
uint8_t isStolen = packet.readUInt8(); uint8_t isStolen = packet.readUInt8();
uint32_t count = packet.readUInt32(); uint32_t count = packet.readUInt32();
// Collect first dispelled spell id/name; process all entries for combat log // Preserve every dispelled aura in the combat log instead of collapsing
// Each entry: uint32 spellId + uint8 isPositive (5 bytes in WotLK/TBC/Classic) // multi-aura packets down to the first entry only.
uint32_t firstDispelledId = 0; std::vector<uint32_t> dispelledIds;
dispelledIds.reserve(count);
std::string firstSpellName; std::string firstSpellName;
for (uint32_t i = 0; i < count && packet.getSize() - packet.getReadPos() >= 5; ++i) { for (uint32_t i = 0; i < count && packet.getSize() - packet.getReadPos() >= 5; ++i) {
uint32_t dispelledId = packet.readUInt32(); uint32_t dispelledId = packet.readUInt32();
/*uint8_t isPositive =*/ packet.readUInt8(); /*uint8_t isPositive =*/ packet.readUInt8();
if (dispelledId != 0) {
dispelledIds.push_back(dispelledId);
}
if (i == 0) { if (i == 0) {
firstDispelledId = dispelledId;
const std::string& nm = getSpellName(dispelledId); const std::string& nm = getSpellName(dispelledId);
firstSpellName = nm.empty() ? ("spell " + std::to_string(dispelledId)) : nm; firstSpellName = nm.empty() ? ("spell " + std::to_string(dispelledId)) : nm;
} }
@ -6195,13 +6198,15 @@ void GameHandler::handlePacket(network::Packet& packet) {
addSystemChatMessage(buf); addSystemChatMessage(buf);
} }
// Preserve stolen auras as spellsteal events so the log wording stays accurate. // Preserve stolen auras as spellsteal events so the log wording stays accurate.
if (firstDispelledId != 0) { if (!dispelledIds.empty()) {
bool isPlayerCaster = (casterGuid == playerGuid); bool isPlayerCaster = (casterGuid == playerGuid);
for (uint32_t dispelledId : dispelledIds) {
addCombatText(isStolen ? CombatTextEntry::STEAL : CombatTextEntry::DISPEL, addCombatText(isStolen ? CombatTextEntry::STEAL : CombatTextEntry::DISPEL,
0, firstDispelledId, isPlayerCaster, 0, 0, dispelledId, isPlayerCaster, 0,
casterGuid, victimGuid); casterGuid, victimGuid);
} }
} }
}
packet.setReadPos(packet.getSize()); packet.setReadPos(packet.getSize());
break; break;
} }
@ -6228,14 +6233,17 @@ void GameHandler::handlePacket(network::Packet& packet) {
/*uint32_t stealSpellId =*/ packet.readUInt32(); /*uint32_t stealSpellId =*/ packet.readUInt32();
/*uint8_t isStolen =*/ packet.readUInt8(); /*uint8_t isStolen =*/ packet.readUInt8();
uint32_t stealCount = packet.readUInt32(); uint32_t stealCount = packet.readUInt32();
// Collect stolen spell info; show feedback when we are caster or victim // Preserve every stolen aura in the combat log instead of only the first.
uint32_t firstStolenId = 0; std::vector<uint32_t> stolenIds;
stolenIds.reserve(stealCount);
std::string stolenName; std::string stolenName;
for (uint32_t i = 0; i < stealCount && packet.getSize() - packet.getReadPos() >= 5; ++i) { for (uint32_t i = 0; i < stealCount && packet.getSize() - packet.getReadPos() >= 5; ++i) {
uint32_t stolenId = packet.readUInt32(); uint32_t stolenId = packet.readUInt32();
/*uint8_t isPos =*/ packet.readUInt8(); /*uint8_t isPos =*/ packet.readUInt8();
if (stolenId != 0) {
stolenIds.push_back(stolenId);
}
if (i == 0) { if (i == 0) {
firstStolenId = stolenId;
const std::string& nm = getSpellName(stolenId); const std::string& nm = getSpellName(stolenId);
stolenName = nm.empty() ? ("spell " + std::to_string(stolenId)) : nm; stolenName = nm.empty() ? ("spell " + std::to_string(stolenId)) : nm;
} }
@ -6250,12 +6258,14 @@ void GameHandler::handlePacket(network::Packet& packet) {
addSystemChatMessage(buf); addSystemChatMessage(buf);
} }
// Preserve spellsteal as a distinct event so the UI wording stays accurate. // Preserve spellsteal as a distinct event so the UI wording stays accurate.
if (firstStolenId != 0) { if (!stolenIds.empty()) {
bool isPlayerCaster = (stealCaster == playerGuid); bool isPlayerCaster = (stealCaster == playerGuid);
addCombatText(CombatTextEntry::STEAL, 0, firstStolenId, isPlayerCaster, 0, for (uint32_t stolenId : stolenIds) {
addCombatText(CombatTextEntry::STEAL, 0, stolenId, isPlayerCaster, 0,
stealCaster, stealVictim); stealCaster, stealVictim);
} }
} }
}
packet.setReadPos(packet.getSize()); packet.setReadPos(packet.getSize());
break; break;
} }