Core/Auras: Use recalculated aura max duration on spell hit for duration calculations.

2011-06-07 14:19:47 +02:00
parent 3effdb2c23
commit 9542077c38
4 changed files with 36 additions and 19 deletions
@@ -3113,7 +3113,10 @@ void Unit::DeMorph()

 Aura* Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const* newAura, uint8 effMask, Unit* caster, int32* baseAmount /*= NULL*/, Item* castItem /*= NULL*/, uint64 casterGUID /*= 0*/)
 {
-    ASSERT(casterGUID);
+    ASSERT(casterGUID || caster);
+    if (!casterGUID)
+        casterGUID = caster->GetGUID();
+
    // passive and Incanter's Absorption and auras with different type can stack with themselves any number of times
    if (!IsPassiveSpell(newAura) && newAura->Id != 44413)
    {