diff options
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9f609df1394..a3757827b6d 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3435,9 +3435,8 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster) if (Aura * foundAura = GetOwnedAura(aura->GetId(), aura->GetCasterGUID(), aura->GetCastItemGUID(), 0, aura)) { if (aura->GetSpellProto()->StackAmount) - { aura->ModStackAmount(foundAura->GetStackAmount()); - } + // Update periodic timers from the previous aura for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 87a9b322be3..758111be8a0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -258,13 +258,12 @@ public: Unit *GetHatedManaUser() const { - std::list<HostileReference*>::const_iterator i; - for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i) - { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit->getPowerType() == POWER_MANA) - return pUnit; - } + std::list<HostileReference*> const& threatList = me->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::const_iterator i = threatList.begin(); i != threatList.end(); ++i) + if (Unit* unit = (*i)->getTarget()) + if (unit->getPowerType() == POWER_MANA) + return unit; + return NULL; } |