From 97df861c52c21d032ba65a1702b71eb3bdd975f7 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 10 Mar 2024 00:34:23 +0100 Subject: Core/Auras: Update visible aura immediately during spell cast instead of waiting for next update tick (cherry picked from commit 62dc916184d5d32b26a2d331d84d3cae481040fb) --- src/server/game/Entities/Unit/Unit.h | 5 +++-- src/server/game/Spells/Spell.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 7e647d74b89..86040e3dcbd 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1528,10 +1528,11 @@ class TC_GAME_API Unit : public WorldObject uint32 m_lastSanctuaryTime; VisibleAuraContainer const& GetVisibleAuras() const { return m_visibleAuras; } - bool HasVisibleAura(AuraApplication* aurApp) const { return m_visibleAuras.count(aurApp) > 0; } + bool HasVisibleAura(AuraApplication* aurApp) const { return m_visibleAuras.contains(aurApp); } void SetVisibleAura(AuraApplication* aurApp); - void SetVisibleAuraUpdate(AuraApplication* aurApp) { m_visibleAurasToUpdate.insert(aurApp); } void RemoveVisibleAura(AuraApplication* aurApp); + void SetVisibleAuraUpdate(AuraApplication* aurApp) { m_visibleAurasToUpdate.insert(aurApp); } + void RemoveVisibleAuraUpdate(AuraApplication* aurApp) { m_visibleAurasToUpdate.erase(aurApp); } bool HasInterruptFlag(SpellAuraInterruptFlags flags) const { return m_interruptMask.HasFlag(flags); } bool HasInterruptFlag(SpellAuraInterruptFlags2 flags) const { return m_interruptMask2.HasFlag(flags); } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 66f710eda7c..53f3f79bc92 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3026,6 +3026,12 @@ void Spell::TargetInfo::DoDamageAndTriggers(Spell* spell) if (effMask) _spellHitTarget->_ApplyAura(aurApp, effMask); + + if (aurApp->IsNeedClientUpdate() && aurApp->GetRemoveMode() == AURA_REMOVE_NONE) + { + aurApp->ClientUpdate(false); + _spellHitTarget->RemoveVisibleAuraUpdate(aurApp); + } } } -- cgit v1.2.3