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

fix: correct SMSG_DISPEL_FAILED packet format and improve message

Browse source 
WotLK sends spellId(4) + packed_guid caster + packed_guid victim, while
TBC/Classic sends full uint64 caster + uint64 victim + spellId(4).
The previous handler assumed TBC format unconditionally, causing incorrect
reads in WotLK mode.

Also use the spell name cache to display "Purge failed to dispel." rather
than a raw "Dispel failed! (spell N)" message.
This commit is contained in:
Kelsi 2026-03-11 02:49:37 -07:00
parent 1f4880985b
commit 9cd7e7978d
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/game/game_handler.cpp
View file

@ -2864,13 +2864,33 @@ void GameHandler::handlePacket(network::Packet& packet) {
handleAuraUpdate(packet, true);
break;
case Opcode::SMSG_DISPEL_FAILED: {
// casterGuid(8) + victimGuid(8) + spellId(4) [+ failing spellId(4)...]
if (packet.getSize() - packet.getReadPos() >= 20) {
/*uint64_t casterGuid =*/ packet.readUInt64();
/*uint64_t victimGuid =*/ packet.readUInt64();
uint32_t spellId = packet.readUInt32();
// WotLK: uint32 dispelSpellId + packed_guid caster + packed_guid victim
// [+ count × uint32 failedSpellId]
// TBC/Classic: uint64 caster + uint64 victim + uint32 spellId
// [+ count × uint32 failedSpellId]
const bool dispelTbcLike = isClassicLikeExpansion() || isActiveExpansion("tbc");
uint32_t dispelSpellId = 0;
if (dispelTbcLike) {
if (packet.getSize() - packet.getReadPos() < 20) break;
/*uint64_t caster =*/ packet.readUInt64();
/*uint64_t victim =*/ packet.readUInt64();
dispelSpellId = packet.readUInt32();
} else {
if (packet.getSize() - packet.getReadPos() < 4) break;
dispelSpellId = packet.readUInt32();
if (packet.getSize() - packet.getReadPos() < 1) break;
/*uint64_t caster =*/ UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 1) break;
/*uint64_t victim =*/ UpdateObjectParser::readPackedGuid(packet);
}
{
loadSpellNameCache();
auto it = spellNameCache_.find(dispelSpellId);
char buf[128];
std::snprintf(buf, sizeof(buf), "Dispel failed! (spell %u)", spellId);
if (it != spellNameCache_.end() && !it->second.name.empty())
std::snprintf(buf, sizeof(buf), "%s failed to dispel.", it->second.name.c_str());
else
std::snprintf(buf, sizeof(buf), "Dispel failed! (spell %u)", dispelSpellId);
addSystemChatMessage(buf);
}
break;