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

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

Browse source
This commit is contained in:
Kelsi 2026-03-14 01:25:47 -07:00
parent 0fc887a3d2
commit a48f6d1044
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/game_handler.cpp
View file

@ -6206,17 +6206,23 @@ void GameHandler::handlePacket(network::Packet& packet) {
packet.setReadPos(packet.getSize()); packet.setReadPos(packet.getSize());
break; break;
case Opcode::SMSG_SPELLORDAMAGE_IMMUNE: { case Opcode::SMSG_SPELLORDAMAGE_IMMUNE: {
// WotLK: packed casterGuid + packed victimGuid + uint32 spellId + uint8 saveType // WotLK/Classic/Turtle: packed casterGuid + packed victimGuid + uint32 spellId + uint8 saveType
// TBC/Classic: full uint64 casterGuid + full uint64 victimGuid + uint32 + uint8 // TBC: full uint64 casterGuid + full uint64 victimGuid + uint32 + uint8
const bool immuneTbcLike = isClassicLikeExpansion() || isActiveExpansion("tbc"); const bool immuneUsesFullGuid = isActiveExpansion("tbc");
const size_t minSz = immuneTbcLike ? 21u : 2u; const size_t minSz = immuneUsesFullGuid ? 21u : 2u;
if (packet.getSize() - packet.getReadPos() < minSz) { if (packet.getSize() - packet.getReadPos() < minSz) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint64_t casterGuid = immuneTbcLike if (!immuneUsesFullGuid && !hasFullPackedGuid(packet)) {
packet.setReadPos(packet.getSize()); break;
}
uint64_t casterGuid = immuneUsesFullGuid
? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet); ? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < (immuneTbcLike ? 8u : 2u)) break; if (packet.getSize() - packet.getReadPos() < (immuneUsesFullGuid ? 8u : 2u)
uint64_t victimGuid = immuneTbcLike || (!immuneUsesFullGuid && !hasFullPackedGuid(packet))) {
packet.setReadPos(packet.getSize()); break;
}
uint64_t victimGuid = immuneUsesFullGuid
? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet); ? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 5) break; if (packet.getSize() - packet.getReadPos() < 5) break;
uint32_t immuneSpellId = packet.readUInt32(); uint32_t immuneSpellId = packet.readUInt32();