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

fix(combatlog): parse classic proc log GUIDs as packed

Browse source
This commit is contained in:
Kelsi 2026-03-14 00:45:50 -07:00
parent 8ba5ca5337
commit fd8ea4e69e
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/game/game_handler.cpp
View file

@ -2086,17 +2086,17 @@ void GameHandler::handlePacket(network::Packet& packet) {
// ---- Spell proc resist log ---- // ---- Spell proc resist log ----
case Opcode::SMSG_PROCRESIST: { case Opcode::SMSG_PROCRESIST: {
// WotLK: packed_guid caster + packed_guid victim + uint32 spellId + ... // WotLK/Classic/Turtle: packed_guid caster + packed_guid victim + uint32 spellId + ...
// TBC/Classic: uint64 caster + uint64 victim + uint32 spellId + ... // TBC: uint64 caster + uint64 victim + uint32 spellId + ...
const bool prTbcLike = isClassicLikeExpansion() || isActiveExpansion("tbc"); const bool prUsesFullGuid = isActiveExpansion("tbc");
auto readPrGuid = [&]() -> uint64_t { auto readPrGuid = [&]() -> uint64_t {
if (prTbcLike) if (prUsesFullGuid)
return (packet.getSize() - packet.getReadPos() >= 8) ? packet.readUInt64() : 0; return (packet.getSize() - packet.getReadPos() >= 8) ? packet.readUInt64() : 0;
return UpdateObjectParser::readPackedGuid(packet); return UpdateObjectParser::readPackedGuid(packet);
}; };
if (packet.getSize() - packet.getReadPos() < (prTbcLike ? 8u : 1u)) break; if (packet.getSize() - packet.getReadPos() < (prUsesFullGuid ? 8u : 1u)) break;
uint64_t caster = readPrGuid(); uint64_t caster = readPrGuid();
if (packet.getSize() - packet.getReadPos() < (prTbcLike ? 8u : 1u)) break; if (packet.getSize() - packet.getReadPos() < (prUsesFullGuid ? 8u : 1u)) break;
uint64_t victim = readPrGuid(); uint64_t victim = readPrGuid();
if (packet.getSize() - packet.getReadPos() < 4) break; if (packet.getSize() - packet.getReadPos() < 4) break;
uint32_t spellId = packet.readUInt32(); uint32_t spellId = packet.readUInt32();
@ -6355,19 +6355,19 @@ void GameHandler::handlePacket(network::Packet& packet) {
break; break;
} }
case Opcode::SMSG_SPELL_CHANCE_PROC_LOG: { case Opcode::SMSG_SPELL_CHANCE_PROC_LOG: {
// WotLK: packed_guid target + packed_guid caster + uint32 spellId + ... // WotLK/Classic/Turtle: packed_guid target + packed_guid caster + uint32 spellId + ...
// TBC/Classic: uint64 target + uint64 caster + uint32 spellId + ... // TBC: uint64 target + uint64 caster + uint32 spellId + ...
const bool procChanceTbcLike = isClassicLikeExpansion() || isActiveExpansion("tbc"); const bool procChanceUsesFullGuid = isActiveExpansion("tbc");
auto readProcChanceGuid = [&]() -> uint64_t { auto readProcChanceGuid = [&]() -> uint64_t {
if (procChanceTbcLike) if (procChanceUsesFullGuid)
return (packet.getSize() - packet.getReadPos() >= 8) ? packet.readUInt64() : 0; return (packet.getSize() - packet.getReadPos() >= 8) ? packet.readUInt64() : 0;
return UpdateObjectParser::readPackedGuid(packet); return UpdateObjectParser::readPackedGuid(packet);
}; };
if (packet.getSize() - packet.getReadPos() < (procChanceTbcLike ? 8u : 1u)) { if (packet.getSize() - packet.getReadPos() < (procChanceUsesFullGuid ? 8u : 1u)) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint64_t procTargetGuid = readProcChanceGuid(); uint64_t procTargetGuid = readProcChanceGuid();
if (packet.getSize() - packet.getReadPos() < (procChanceTbcLike ? 8u : 1u)) { if (packet.getSize() - packet.getReadPos() < (procChanceUsesFullGuid ? 8u : 1u)) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint64_t procCasterGuid = readProcChanceGuid(); uint64_t procCasterGuid = readProcChanceGuid();