diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h index 034d75c1ed..3b9453ed20 100644 --- a/src/common/Utilities/EventProcessor.h +++ b/src/common/Utilities/EventProcessor.h @@ -111,6 +111,7 @@ class TC_COMMON_API EventProcessor is_lambda_event AddEventAtOffset(T&& event, Milliseconds offset, Milliseconds offset2) { AddEventAtOffset(new LambdaBasicEvent(std::move(event)), offset, offset2); } void ModifyEventTime(BasicEvent* event, uint64 newTime); uint64 CalculateTime(uint64 t_offset) const { return m_time + t_offset; } + EventList& GetEventList() { return m_events; } protected: uint64 m_time; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index eedce7de7a..beec1a9611 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -68,6 +68,7 @@ #include "SpellHistory.h" #include "SpellInfo.h" #include "SpellMgr.h" +#include "SpellPackets.h" #include "TemporarySummon.h" #include "Totem.h" #include "Transport.h" @@ -12514,6 +12515,33 @@ void Unit::SendPlaySpellVisualKit(uint32 id, uint32 type, uint32 duration) const SendMessageToSet(&data, true); } +void Unit::CancelSpellMissiles(uint32 spellId, bool reverseMissile /*= false*/) +{ + EventList& eventList = m_Events.GetEventList(); + bool hasMissile = false; + + for (auto itr : eventList) + { + if (Spell const* spell = Spell::ExtractSpellFromEvent(itr.second)) + { + if (spell->GetSpellInfo()->Id == spellId) + { + itr.second->ScheduleAbort(); + hasMissile = true; + } + } + } + + if (hasMissile) + { + WorldPackets::Spells::MissileCancel packet; + packet.OwnerGUID = GetGUID(); + packet.SpellID = spellId; + packet.Reverse = reverseMissile; + SendMessageToSet(packet.Write(), false); + } +} + void Unit::ApplyResilience(Unit const* victim, int32* damage) const { // player mounted on multi-passenger mount is also classified as vehicle diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 1cc8570946..b94d5c889f 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1320,6 +1320,7 @@ class TC_GAME_API Unit : public WorldObject Aura* AddAura(SpellInfo const* spellInfo, uint8 effMask, Unit* target); void SetAuraStack(uint32 spellId, Unit* target, uint32 stack); void SendPlaySpellVisualKit(uint32 id, uint32 type, uint32 duration) const; + void CancelSpellMissiles(uint32 spellId, bool reverseMissile = false); void DeMorph(); diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp index cdda13dc1b..f9b66ad140 100644 --- a/src/server/game/Server/Packets/SpellPackets.cpp +++ b/src/server/game/Server/Packets/SpellPackets.cpp @@ -259,3 +259,30 @@ WorldPacket const* WorldPackets::Spells::AuraUpdateAll::Write() return &_worldPacket; } + +WorldPacket const* WorldPackets::Spells::MissileCancel::Write() +{ + _worldPacket.WriteBit(OwnerGUID[7]); + _worldPacket.WriteBit(OwnerGUID[2]); + _worldPacket.WriteBit(OwnerGUID[4]); + _worldPacket.WriteBit(OwnerGUID[6]); + _worldPacket.WriteBit(Reverse); + _worldPacket.WriteBit(OwnerGUID[1]); + _worldPacket.WriteBit(OwnerGUID[0]); + _worldPacket.WriteBit(OwnerGUID[3]); + _worldPacket.WriteBit(OwnerGUID[5]); + + _worldPacket.FlushBits(); + + _worldPacket.WriteByteSeq(OwnerGUID[6]); + _worldPacket.WriteByteSeq(OwnerGUID[1]); + _worldPacket.WriteByteSeq(OwnerGUID[4]); + _worldPacket.WriteByteSeq(OwnerGUID[2]); + _worldPacket.WriteByteSeq(OwnerGUID[5]); + _worldPacket.WriteByteSeq(OwnerGUID[7]); + _worldPacket << uint32(SpellID); + _worldPacket.WriteByteSeq(OwnerGUID[0]); + _worldPacket.WriteByteSeq(OwnerGUID[3]); + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h index 34fce698cf..52f7e3f83e 100644 --- a/src/server/game/Server/Packets/SpellPackets.h +++ b/src/server/game/Server/Packets/SpellPackets.h @@ -218,6 +218,18 @@ namespace WorldPackets ObjectGuid UnitGUID; std::vector Auras; }; + + class MissileCancel final : public ServerPacket + { + public: + MissileCancel() : ServerPacket(SMSG_MISSILE_CANCEL, 13) { } + + WorldPacket const* Write() override; + + ObjectGuid OwnerGUID; + bool Reverse = false; + int32 SpellID = 0; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 28035d8d1a..5cd3dceeff 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1018,7 +1018,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_MINIGAME_SETUP, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MINIGAME_STATE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MIRRORIMAGE_DATA, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_MISSILE_CANCEL, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_MISSILE_CANCEL, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MODIFY_COOLDOWN, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MONEY_NOTIFY, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MONSTER_MOVE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 5ca750b190..5328fb5b4f 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -525,16 +525,17 @@ SpellValue::SpellValue(SpellInfo const* proto) class TC_GAME_API SpellEvent : public BasicEvent { - public: - SpellEvent(Spell* spell); - ~SpellEvent(); +public: + SpellEvent(Spell* spell); + ~SpellEvent(); - virtual bool Execute(uint64 e_time, uint32 p_time) override; - virtual void Abort(uint64 e_time) override; - virtual bool IsDeletable() const override; + bool Execute(uint64 e_time, uint32 p_time) override; + void Abort(uint64 e_time) override; + bool IsDeletable() const override; + Spell const* GetSpell() const { return m_Spell; } - protected: - Spell* m_Spell; +protected: + Spell* m_Spell; }; Spell::Spell(Unit* caster, SpellInfo const* info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID, bool skipCheck) : @@ -5371,6 +5372,14 @@ void Spell::HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGoT } } +/*static*/ Spell const* Spell::ExtractSpellFromEvent(BasicEvent* event) +{ + if (SpellEvent* spellEvent = dynamic_cast(event)) + return spellEvent->GetSpell(); + + return nullptr; +} + SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint32* param2 /*= nullptr*/, MountResult* mountResult /*= nullptr*/) { // check death state diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 9986d7711e..d72a1b46cf 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -37,6 +37,7 @@ namespace WorldPackets class Aura; class AuraEffect; +class BasicEvent; class ByteBuffer; class Corpse; class DynamicObject; @@ -47,7 +48,6 @@ class PathGenerator; class Player; class SpellImplicitTargetInfo; class SpellInfo; -class SpellEvent; class SpellScript; class Unit; class WorldObject; @@ -512,6 +512,7 @@ class TC_GAME_API Spell void HandleHolyPower(Player* caster); void HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGoTarget, Corpse* pCorpseTarget, uint32 i, SpellEffectHandleMode mode); void HandleThreatSpells(); + static Spell const* ExtractSpellFromEvent(BasicEvent* event); SpellInfo const* const m_spellInfo; Item* m_CastItem; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp index 14e69f5581..68a4bc48e5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp @@ -17,7 +17,6 @@ /* TODO List: -- Spell missile canceling needs to be implemented for rewinding already launched Distortion Bomb missiles. - This whole rewinding process is one big mess at the moment. Need to check for more serverside spells to clean this up. - Distortion Bomb timers are quite inconsistent after two and more rewinds in sniffs. Need clearer data. */ @@ -253,8 +252,9 @@ struct boss_murozond : public BossAI me->AttackStop(); me->StopMoving(); me->SetReactState(REACT_PASSIVE); + me->CancelSpellMissiles(SPELL_DISTORTION_BOMB_1, true); + me->CancelSpellMissiles(SPELL_DISTORTION_BOMB_2, true); me->RemoveAllDynObjects(); - // Todo: implement missile canceling for (auto& itr : instance->instance->GetPlayers()) { @@ -300,6 +300,8 @@ struct boss_murozond : public BossAI me->AttackStop(); me->SetReactState(REACT_PASSIVE); me->SetAIAnimKitId(AI_ANIM_KIT_MUROZOND_DEATH); + me->CancelSpellMissiles(SPELL_DISTORTION_BOMB_1, true); + me->CancelSpellMissiles(SPELL_DISTORTION_BOMB_2, true); me->RemoveAllDynObjects(); DoCastSelf(SPELL_FADING); DoCastAOE(SPELL_ACHIEVEMENT_CREDIT);