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: consume all SpellCastTargets bytes in WotLK SpellStartParser

Browse source 
Replaced partial UNIT/OBJECT-only flag handling with full WotLK
SpellCastTargets layout: UNIT/UNIT_MINIPET/CORPSE/GAMEOBJECT share
one PackedGuid, ITEM/TRADE_ITEM share one PackedGuid, SOURCE_LOCATION
and DEST_LOCATION are each PackedGuid+3floats (transport-relative),
STRING is null-terminated. Prevents byte-stream corruption on
ground-targeted AoE and similar multi-field target packets.
This commit is contained in:
Kelsi 2026-03-17 22:20:03 -07:00
parent a4415eb207
commit dd64724dbb
1 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/game/world_packets.cpp
View file

@ -3780,14 +3780,44 @@ bool SpellStartParser::parse(network::Packet& packet, SpellStartData& data) {
return false; return false;
} }
// WotLK 3.3.5a SpellCastTargets — consume ALL target payload bytes so that
// subsequent fields (e.g. school mask, cast flags 0x20 extra data) are not
// misaligned for ground-targeted or AoE spells.
uint32_t targetFlags = packet.readUInt32(); uint32_t targetFlags = packet.readUInt32();
const bool needsTargetGuid = (targetFlags & 0x02) || (targetFlags & 0x800); // UNIT/OBJECT
if (needsTargetGuid) { auto readPackedTarget = [&](uint64_t* out) -> bool {
if (!hasFullPackedGuid(packet)) { if (!hasFullPackedGuid(packet)) return false;
packet.setReadPos(startPos); uint64_t g = UpdateObjectParser::readPackedGuid(packet);
return false; if (out) *out = g;
} return true;
data.targetGuid = UpdateObjectParser::readPackedGuid(packet); };
auto skipPackedAndFloats3 = [&]() -> bool {
if (!hasFullPackedGuid(packet)) return false;
UpdateObjectParser::readPackedGuid(packet); // transport GUID (may be zero)
if (packet.getSize() - packet.getReadPos() < 12) return false;
packet.readFloat(); packet.readFloat(); packet.readFloat();
return true;
};
// UNIT/UNIT_MINIPET/CORPSE_ALLY/GAMEOBJECT share a single object target GUID
if (targetFlags & (0x0002u | 0x0004u | 0x0400u | 0x0800u)) {
readPackedTarget(&data.targetGuid); // best-effort; ignore failure
}
// ITEM/TRADE_ITEM share a single item target GUID
if (targetFlags & (0x0010u | 0x0100u)) {
readPackedTarget(nullptr);
}
// SOURCE_LOCATION: PackedGuid (transport) + float x,y,z
if (targetFlags & 0x0020u) {
skipPackedAndFloats3();
}
// DEST_LOCATION: PackedGuid (transport) + float x,y,z
if (targetFlags & 0x0040u) {
skipPackedAndFloats3();
}
// STRING: null-terminated
if (targetFlags & 0x0200u) {
while (packet.getReadPos() < packet.getSize() && packet.readUInt8() != 0) {}
} }
LOG_DEBUG("Spell start: spell=", data.spellId, " castTime=", data.castTime, "ms"); LOG_DEBUG("Spell start: spell=", data.spellId, " castTime=", data.castTime, "ms");