From b842f2be5509d804363183e0445ed71cb5eb221b Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 9 Feb 2023 19:04:23 +0100 Subject: Core/Auras: Remove channeled auras when caster and target are not on the same map Closes #28777 Closes #28792 (cherry picked from commit d23c839998263330aa475125e0bca16dd8fe51bb) --- src/server/game/Entities/Unit/Unit.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 46568161698..35c7da03d82 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2756,6 +2756,8 @@ void Unit::_UpdateSpells(uint32 time) { if (i->second->IsExpired()) RemoveOwnedAura(i, AURA_REMOVE_BY_EXPIRE); + else if (i->second->GetSpellInfo()->IsChanneled() && i->second->GetCasterGUID() != GetGUID() && !ObjectAccessor::GetWorldObject(*this, i->second->GetCasterGUID())) + RemoveOwnedAura(i, AURA_REMOVE_BY_CANCEL); // remove channeled auras when caster is not on the same map else ++i; } -- cgit v1.2.3