From d4aaa3d3b273599120e32fd7dd59df4f36abb9b5 Mon Sep 17 00:00:00 2001
From: n0n4m3 <none@none>
Date: Sun, 20 Dec 2009 15:20:03 +0100
Subject: Fixed Divine Aegis

--HG--
branch : trunk
---
 src/game/Unit.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index bc36ca8aaf4..5ac280f2add 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5812,7 +5812,15 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             // Divine Aegis
             if (dummySpell->SpellIconID == 2820)
             {
-                basepoints0 = damage * triggerAmount/100;
+                // Multiple effects stack, so let's try to find this aura.
+                int32 bonus = 0;
+                if (AuraEffect *aurEff = target->GetAuraEffect(47753, 0))
+                    bonus = aurEff->GetAmount();
+                
+                basepoints0 = damage * triggerAmount/100 + bonus;
+                if (basepoints0 > target->getLevel() * 125)
+                    basepoints0 = target->getLevel() * 125;
+
                 triggered_spell_id = 47753;
                 break;
             }
-- 
cgit v1.2.3