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 spelllogexecute GUIDs as packed

Browse source
This commit is contained in:
Kelsi 2026-03-14 00:24:21 -07:00
parent a147347393
commit ed5134d601
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/game/game_handler.cpp
View file

@ -6408,8 +6408,8 @@ void GameHandler::handlePacket(network::Packet& packet) {
break; break;
} }
case Opcode::SMSG_SPELLLOGEXECUTE: { case Opcode::SMSG_SPELLLOGEXECUTE: {
// WotLK: packed_guid caster + uint32 spellId + uint32 effectCount // WotLK/Classic/Turtle: packed_guid caster + uint32 spellId + uint32 effectCount
// TBC/Classic: uint64 caster + uint32 spellId + uint32 effectCount // TBC: uint64 caster + uint32 spellId + uint32 effectCount
// Per-effect: uint8 effectType + uint32 effectLogCount + effect-specific data // Per-effect: uint8 effectType + uint32 effectLogCount + effect-specific data
// Effect 10 = POWER_DRAIN: packed_guid target + uint32 amount + uint32 powerType + float multiplier // Effect 10 = POWER_DRAIN: packed_guid target + uint32 amount + uint32 powerType + float multiplier
// Effect 11 = HEALTH_LEECH: packed_guid target + uint32 amount + float multiplier // Effect 11 = HEALTH_LEECH: packed_guid target + uint32 amount + float multiplier
@ -6417,7 +6417,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
// Effect 26 = INTERRUPT_CAST: packed_guid target + uint32 interrupted_spell_id // Effect 26 = INTERRUPT_CAST: packed_guid target + uint32 interrupted_spell_id
// Effect 49 = FEED_PET: uint32 itemEntry // Effect 49 = FEED_PET: uint32 itemEntry
// Effect 114= CREATE_ITEM2: uint32 itemEntry (same layout as CREATE_ITEM) // Effect 114= CREATE_ITEM2: uint32 itemEntry (same layout as CREATE_ITEM)
const bool exeTbcLike = isClassicLikeExpansion() || isActiveExpansion("tbc"); const bool exeUsesFullGuid = isActiveExpansion("tbc");
const auto hasFullPackedGuid = [&packet]() -> bool { const auto hasFullPackedGuid = [&packet]() -> bool {
if (packet.getReadPos() >= packet.getSize()) { if (packet.getReadPos() >= packet.getSize()) {
return false; return false;
@ -6432,13 +6432,13 @@ void GameHandler::handlePacket(network::Packet& packet) {
} }
return packet.getSize() - packet.getReadPos() >= guidBytes; return packet.getSize() - packet.getReadPos() >= guidBytes;
}; };
if (packet.getSize() - packet.getReadPos() < (exeTbcLike ? 8u : 1u)) { if (packet.getSize() - packet.getReadPos() < (exeUsesFullGuid ? 8u : 1u)) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
if (!exeTbcLike && !hasFullPackedGuid()) { if (!exeUsesFullGuid && !hasFullPackedGuid()) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint64_t exeCaster = exeTbcLike uint64_t exeCaster = exeUsesFullGuid
? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet); ? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 8) { if (packet.getSize() - packet.getReadPos() < 8) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
@ -6456,11 +6456,11 @@ void GameHandler::handlePacket(network::Packet& packet) {
if (effectType == 10) { if (effectType == 10) {
// SPELL_EFFECT_POWER_DRAIN: packed_guid target + uint32 amount + uint32 powerType + float multiplier // SPELL_EFFECT_POWER_DRAIN: packed_guid target + uint32 amount + uint32 powerType + float multiplier
for (uint32_t li = 0; li < effectLogCount; ++li) { for (uint32_t li = 0; li < effectLogCount; ++li) {
if (packet.getSize() - packet.getReadPos() < (exeTbcLike ? 8u : 1u) if (packet.getSize() - packet.getReadPos() < (exeUsesFullGuid ? 8u : 1u)
|| (!exeTbcLike && !hasFullPackedGuid())) { || (!exeUsesFullGuid && !hasFullPackedGuid())) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint64_t drainTarget = exeTbcLike uint64_t drainTarget = exeUsesFullGuid
? packet.readUInt64() ? packet.readUInt64()
: UpdateObjectParser::readPackedGuid(packet); : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 12) { packet.setReadPos(packet.getSize()); break; } if (packet.getSize() - packet.getReadPos() < 12) { packet.setReadPos(packet.getSize()); break; }
@ -6494,11 +6494,11 @@ void GameHandler::handlePacket(network::Packet& packet) {
} else if (effectType == 11) { } else if (effectType == 11) {
// SPELL_EFFECT_HEALTH_LEECH: packed_guid target + uint32 amount + float multiplier // SPELL_EFFECT_HEALTH_LEECH: packed_guid target + uint32 amount + float multiplier
for (uint32_t li = 0; li < effectLogCount; ++li) { for (uint32_t li = 0; li < effectLogCount; ++li) {
if (packet.getSize() - packet.getReadPos() < (exeTbcLike ? 8u : 1u) if (packet.getSize() - packet.getReadPos() < (exeUsesFullGuid ? 8u : 1u)
|| (!exeTbcLike && !hasFullPackedGuid())) { || (!exeUsesFullGuid && !hasFullPackedGuid())) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint64_t leechTarget = exeTbcLike uint64_t leechTarget = exeUsesFullGuid
? packet.readUInt64() ? packet.readUInt64()
: UpdateObjectParser::readPackedGuid(packet); : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 8) { packet.setReadPos(packet.getSize()); break; } if (packet.getSize() - packet.getReadPos() < 8) { packet.setReadPos(packet.getSize()); break; }
@ -6549,11 +6549,11 @@ void GameHandler::handlePacket(network::Packet& packet) {
} else if (effectType == 26) { } else if (effectType == 26) {
// SPELL_EFFECT_INTERRUPT_CAST: packed_guid target + uint32 interrupted_spell_id // SPELL_EFFECT_INTERRUPT_CAST: packed_guid target + uint32 interrupted_spell_id
for (uint32_t li = 0; li < effectLogCount; ++li) { for (uint32_t li = 0; li < effectLogCount; ++li) {
if (packet.getSize() - packet.getReadPos() < (exeTbcLike ? 8u : 1u) if (packet.getSize() - packet.getReadPos() < (exeUsesFullGuid ? 8u : 1u)
|| (!exeTbcLike && !hasFullPackedGuid())) { || (!exeUsesFullGuid && !hasFullPackedGuid())) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint64_t icTarget = exeTbcLike uint64_t icTarget = exeUsesFullGuid
? packet.readUInt64() ? packet.readUInt64()
: UpdateObjectParser::readPackedGuid(packet); : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 4) { packet.setReadPos(packet.getSize()); break; } if (packet.getSize() - packet.getReadPos() < 4) { packet.setReadPos(packet.getSize()); break; }