From 95b6332bef6e266badcbcaddc852750885cb5591 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 6 Mar 2016 03:40:06 -0300 Subject: [PATCH] Revert "Core/Auras: Should not remove other targets' aura if it keeps on same phase than caster" Was causing assertion fails in UnregisterSingleTarget, further research into the issue is needed. This reverts commit d44dd09737c9ae7f33720c854687906452f5a125. Reopens #42 --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 45e6bd65ce..0cebf955ef 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3741,7 +3741,7 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase, bool phaseid) for (AuraList::iterator iter = scAuras.begin(); iter != scAuras.end();) { Aura* aura = *iter; - if (aura->GetUnitOwner() != this && !aura->GetUnitOwner()->IsInPhase(this)) + if (aura->GetUnitOwner() != this && !aura->GetUnitOwner()->IsInPhase(newPhase)) { aura->Remove(); iter = scAuras.begin();