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: pass actual GUIDs and spellId to SPELLDAMAGESHIELD and SPELLORDAMAGE_IMMUNE combat log

Browse source 
These handlers already had casterGuid/victimGuid available but were
discarding the packet spellId and not passing GUIDs to addCombatText.
Now the combat log entries show the correct attacker/victim names and
the spell that caused the reflect/immune event.
This commit is contained in:
Kelsi 2026-03-13 11:51:07 -07:00
parent 8213de1d0f
commit 3bdd3f1d3f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/game_handler.cpp
View file

@ -6102,18 +6102,18 @@ void GameHandler::handlePacket(network::Packet& packet) {
if (packet.getSize() - packet.getReadPos() < 12) {
packet.setReadPos(packet.getSize()); break;
}
/*uint32_t spellId =*/ packet.readUInt32();
uint32_t damage = packet.readUInt32();
uint32_t shieldSpellId = packet.readUInt32();
uint32_t damage = packet.readUInt32();
if (!shieldClassicLike && packet.getSize() - packet.getReadPos() >= 4)
/*uint32_t absorbed =*/ packet.readUInt32();
/*uint32_t school =*/ packet.readUInt32();
// Show combat text: damage shield reflect
if (casterGuid == playerGuid) {
// We have a damage shield that reflected damage
addCombatText(CombatTextEntry::SPELL_DAMAGE, static_cast<int32_t>(damage), 0, true);
addCombatText(CombatTextEntry::SPELL_DAMAGE, static_cast<int32_t>(damage), shieldSpellId, true, 0, casterGuid, victimGuid);
} else if (victimGuid == playerGuid) {
// A damage shield hit us (e.g. target's Thorns)
addCombatText(CombatTextEntry::SPELL_DAMAGE, static_cast<int32_t>(damage), 0, false);
addCombatText(CombatTextEntry::SPELL_DAMAGE, static_cast<int32_t>(damage), shieldSpellId, false, 0, casterGuid, victimGuid);
}
break;
}
@ -6131,13 +6131,13 @@ void GameHandler::handlePacket(network::Packet& packet) {
uint64_t victimGuid = immuneTbcLike
? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 5) break;
/*uint32_t spellId =*/ packet.readUInt32();
uint32_t immuneSpellId = packet.readUInt32();
/*uint8_t saveType =*/ packet.readUInt8();
// Show IMMUNE text when the player is the caster (we hit an immune target)
// or the victim (we are immune)
if (casterGuid == playerGuid || victimGuid == playerGuid) {
addCombatText(CombatTextEntry::IMMUNE, 0, 0,
casterGuid == playerGuid);
addCombatText(CombatTextEntry::IMMUNE, 0, immuneSpellId,
casterGuid == playerGuid, 0, casterGuid, victimGuid);
}
break;
}