aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6742852a481..e056b6d87b1 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14651,8 +14651,6 @@ void Unit::SetInPhase(uint32 id, bool update, bool apply)
if (!IsInWorld())
return;
- RemoveNotOwnSingleTargetAuras(0, true);
-
if (GetTypeId() == TYPEID_UNIT || (!ToPlayer()->IsGameMaster() && !ToPlayer()->GetSession()->PlayerLogout()))
{
HostileRefManager& refManager = getHostileRefManager();
@@ -14692,6 +14690,8 @@ void Unit::SetInPhase(uint32 id, bool update, bool apply)
if (m_SummonSlot[i])
if (Creature* summon = GetMap()->GetCreature(m_SummonSlot[i]))
summon->SetInPhase(id, true, apply);
+
+ RemoveNotOwnSingleTargetAuras(0, true);
}
void Unit::UpdateObjectVisibility(bool forced)
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index 78e8f2d248e..a6743811b34 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -577,9 +577,6 @@ class boss_twilight_halion : public CreatureScript
break;
}
}
-
- private:
- EventMap events;
};
CreatureAI* GetAI(Creature* creature) const override