phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-25 08:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: surface pet/raid/talent/instakill errors in UIError overlay

Browse source 
- SMSG_PET_TAME_FAILURE: "Failed to tame: [reason]" shown as UIError
- SMSG_RAID_GROUP_ONLY: "Must be in raid group" shown as UIError
- SMSG_RAID_READY_CHECK_ERROR: all ready check failures shown as UIError
- SMSG_RESET_FAILED_NOTIFY: instance reset failure shown as UIError
- SMSG_TALENTS_INVOLUNTARILY_RESET: talents reset notification shown as UIError
- SMSG_EQUIPMENT_SET_USE_RESULT failure: shown as UIError
- SMSG_SPELLINSTAKILLLOG (player victim): instakill notification shown as UIError
This commit is contained in:
Kelsi 2026-03-17 17:45:45 -07:00
parent 0f2f9ff78d
commit 5ad849666d
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/game/game_handler.cpp
View file

@ -2049,6 +2049,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
uint8_t reason = packet.readUInt8();
const char* msg = (reason < 8) ? reasons[reason] : "Unknown reason";
std::string s = std::string("Failed to tame: ") + msg;
addUIError(s);
addSystemChatMessage(s);
}
break;
@ -6111,6 +6112,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
// Clear cached talent data so the talent screen reflects the reset.
learnedTalents_[0].clear();
learnedTalents_[1].clear();
addUIError("Your talents have been reset by the server.");
addSystemChatMessage("Your talents have been reset by the server.");
packet.setReadPos(packet.getSize());
break;
@ -6205,7 +6207,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
case Opcode::SMSG_EQUIPMENT_SET_USE_RESULT: {
if (packet.getSize() - packet.getReadPos() >= 1) {
uint8_t result = packet.readUInt8();
if (result != 0) addSystemChatMessage("Failed to equip item set.");
if (result != 0) { addUIError("Failed to equip item set."); addSystemChatMessage("Failed to equip item set."); }
}
break;
}
@ -6759,6 +6761,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
addCombatText(CombatTextEntry::INSTAKILL, 0, ikSpell, true, 0, ikCaster, ikVictim);
} else if (ikVictim == playerGuid) {
addCombatText(CombatTextEntry::INSTAKILL, 0, ikSpell, false, 0, ikCaster, ikVictim);
addUIError("You were killed by an instant-kill effect.");
addSystemChatMessage("You were killed by an instant-kill effect.");
}
LOG_DEBUG("SMSG_SPELLINSTAKILLLOG: caster=0x", std::hex, ikCaster,
@ -7288,6 +7291,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
// ---- Instance/raid errors ----
case Opcode::SMSG_RAID_GROUP_ONLY: {
addUIError("You must be in a raid group to enter this instance.");
addSystemChatMessage("You must be in a raid group to enter this instance.");
packet.setReadPos(packet.getSize());
break;
@ -7295,13 +7299,14 @@ void GameHandler::handlePacket(network::Packet& packet) {
case Opcode::SMSG_RAID_READY_CHECK_ERROR: {
if (packet.getSize() - packet.getReadPos() >= 1) {
uint8_t err = packet.readUInt8();
if (err == 0) addSystemChatMessage("Ready check failed: not in a group.");
else if (err == 1) addSystemChatMessage("Ready check failed: in instance.");
else addSystemChatMessage("Ready check failed.");
if (err == 0) { addUIError("Ready check failed: not in a group."); addSystemChatMessage("Ready check failed: not in a group."); }
else if (err == 1) { addUIError("Ready check failed: in instance."); addSystemChatMessage("Ready check failed: in instance."); }
else { addUIError("Ready check failed."); addSystemChatMessage("Ready check failed."); }
}
break;
}
case Opcode::SMSG_RESET_FAILED_NOTIFY: {
addUIError("Cannot reset instance: another player is still inside.");
addSystemChatMessage("Cannot reset instance: another player is still inside.");
packet.setReadPos(packet.getSize());
break;