From 8eb605f67d878e3d78ddb8610655483bd385df30 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 26 Nov 2022 17:59:42 +0100 Subject: [PATCH] Core/Packets: converted SMSG_SPELL_DISPEL_LOG to packet class --- .../game/Server/Packets/CombatLogPackets.cpp | 31 +++++++++++++++++++ .../game/Server/Packets/CombatLogPackets.h | 23 ++++++++++++++ src/server/game/Server/Protocol/Opcodes.cpp | 4 +-- src/server/game/Server/Protocol/Opcodes.h | 4 +-- src/server/game/Spells/SpellEffects.cpp | 28 +++++++++-------- 5 files changed, 73 insertions(+), 17 deletions(-) diff --git a/src/server/game/Server/Packets/CombatLogPackets.cpp b/src/server/game/Server/Packets/CombatLogPackets.cpp index e91d26f40a..a3823b4210 100644 --- a/src/server/game/Server/Packets/CombatLogPackets.cpp +++ b/src/server/game/Server/Packets/CombatLogPackets.cpp @@ -182,3 +182,34 @@ WorldPacket const* WorldPackets::CombatLog::SpellPeriodicAuraLog::Write() return &_worldPacket; } + +ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::CombatLog::SpellDispellData const& dispellData) +{ + data << int32(dispellData.SpellID); + data << bool(dispellData.Harmful); + + return data; +} + +WorldPacket const* WorldPackets::CombatLog::SpellDispellLog::Write() +{ + _worldPacket << TargetGUID.WriteAsPacked(); + _worldPacket << CasterGUID.WriteAsPacked(); + _worldPacket << int32(DispelledBySpellID); + _worldPacket << bool(Debug); + _worldPacket << int32(DispellData.size()); + + for (SpellDispellData const& dispellData : DispellData) + _worldPacket << dispellData; + + if (Debug) + { + for (SpellDispellData const& dispellData : DispellData) + { + _worldPacket << int32(dispellData.Needed); + _worldPacket << int32(dispellData.Rolled); + } + } + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/CombatLogPackets.h b/src/server/game/Server/Packets/CombatLogPackets.h index a1062d37d5..bbd8029290 100644 --- a/src/server/game/Server/Packets/CombatLogPackets.h +++ b/src/server/game/Server/Packets/CombatLogPackets.h @@ -168,6 +168,29 @@ namespace WorldPackets WorldPacket const* Write() override; }; + + struct SpellDispellData + { + bool Harmful = false; + int32 SpellID = 0; + int32 Rolled = 0; + int32 Needed = 0; + }; + + // This packet covers SMSG_SPELL_DISPEL_LOG, SMSG_SPELL_BREAK_LOG and SMSG_SPELL_STEAL_LOG + class SpellDispellLog final : public ServerPacket + { + public: + SpellDispellLog(OpcodeServer opcode) : ServerPacket(opcode, 8 + 8 + 4 + 1 + 1) { } + + bool Debug = false; + int32 DispelledBySpellID = 0; + ObjectGuid TargetGUID; + ObjectGuid CasterGUID; + std::vector DispellData; + + WorldPacket const* Write() override; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 7abff1d830..59caa4010a 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -275,7 +275,7 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_COMMENTATOR_INSTANCE_COMMAND, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_COMMENTATOR_START_WARGAME, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); - DEFINE_HANDLER(CMSG_COMPLAIN, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleComplainOpcode ); + DEFINE_HANDLER(CMSG_COMPLAINT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleComplainOpcode ); DEFINE_HANDLER(CMSG_COMPLETE_CINEMATIC, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCompleteCinematic ); DEFINE_HANDLER(CMSG_COMPLETE_MOVIE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCompleteMovie ); DEFINE_HANDLER(CMSG_CONNECT_TO_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_EarlyProccess ); @@ -1220,7 +1220,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOR_START_EXPERIENCE_INCOMPLETE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLBREAKLOG, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_DAMAGE_SHIELD, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLDISPELLOG, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_DISPEL_LOG, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_ENERGIZE_LOG, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLHEALLOG, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLINSTAKILLLOG, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index dd6bea560a..54f6f57a1b 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -166,7 +166,7 @@ enum OpcodeClient : uint16 CMSG_COMMENTATOR_INSTANCE_COMMAND = 0x0917, CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND = 0x0025, CMSG_COMMENTATOR_START_WARGAME = 0x25A0, - CMSG_COMPLAIN = 0x0427, + CMSG_COMPLAINT = 0x0427, CMSG_COMPLETE_CINEMATIC = 0x2116, CMSG_COMPLETE_MOVIE = 0x4136, CMSG_CONNECT_TO_FAILED = 0x2533, @@ -1179,7 +1179,7 @@ enum OpcodeServer SMSG_SOR_START_EXPERIENCE_INCOMPLETE = 0x7CA7, SMSG_SPELLBREAKLOG = 0x6B17, SMSG_SPELL_DAMAGE_SHIELD = 0x2927, - SMSG_SPELLDISPELLOG = 0x4516, + SMSG_SPELL_DISPEL_LOG = 0x4516, SMSG_SPELL_ENERGIZE_LOG = 0x0414, SMSG_SPELLHEALLOG = 0x2816, SMSG_SPELLINSTAKILLLOG = 0x6216, diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index d136b3b5db..091138c46f 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -23,6 +23,7 @@ #include "Common.h" #include "Creature.h" #include "CreatureAI.h" +#include "CombatLogPackets.h" #include "DatabaseEnv.h" #include "DynamicObject.h" #include "Formulas.h" @@ -2114,21 +2115,22 @@ void Spell::EffectDispel(SpellEffIndex effIndex) if (successList.empty()) return; - WorldPacket dataSuccess(SMSG_SPELLDISPELLOG, 8 + 8 + 4 + 1 + 4 + successList.size() * 5); - // Send packet header - dataSuccess << unitTarget->GetPackGUID(); // Victim GUID - dataSuccess << m_caster->GetPackGUID(); // Caster GUID - dataSuccess << uint32(m_spellInfo->Id); // dispel spell id - dataSuccess << uint8(0); // not used - dataSuccess << uint32(successList.size()); // count - for (DispelChargesList::iterator itr = successList.begin(); itr != successList.end(); ++itr) + WorldPackets::CombatLog::SpellDispellLog spellDispellLog(SMSG_SPELL_DISPEL_LOG); + spellDispellLog.TargetGUID = unitTarget->GetGUID(); + spellDispellLog.CasterGUID = m_caster->GetGUID(); + spellDispellLog.DispelledBySpellID = m_spellInfo->Id; + + for (DispelableAura const& dispelableAura : successList) { - // Send dispelled spell info - dataSuccess << uint32(itr->GetAura()->GetId()); // Spell Id - dataSuccess << uint8(0); // 0 - dispelled !=0 cleansed - unitTarget->RemoveAurasDueToSpellByDispel(itr->GetAura()->GetId(), m_spellInfo->Id, itr->GetAura()->GetCasterGUID(), m_caster, itr->GetDispelCharges()); + WorldPackets::CombatLog::SpellDispellData dispellData; + dispellData.SpellID = dispelableAura.GetAura()->GetId(); + dispellData.Harmful = false; // TODO: use me + + unitTarget->RemoveAurasDueToSpellByDispel(dispelableAura.GetAura()->GetId(), m_spellInfo->Id, dispelableAura.GetAura()->GetCasterGUID(), m_caster, dispelableAura.GetDispelCharges()); + spellDispellLog.DispellData.emplace_back(dispellData); } - m_caster->SendMessageToSet(&dataSuccess, true); + + m_caster->SendMessageToSet(spellDispellLog.Write(), true); CallScriptSuccessfulDispel(effIndex);