From d58e19385fef22123fe856861c21a78d12dc61f9 Mon Sep 17 00:00:00 2001
From: silinoron <none@none>
Date: Thu, 19 Aug 2010 10:37:20 -0700
Subject: Fix combustion crits with area of effect spells - patch by
 moriquendu.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 311ea7bacd0..2cc6ec30244 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7980,7 +7980,11 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
                         return true;                        // charge counting (will removed)
                     }
 
-                    this->CastSpell(this, 28682, true);
+                    // This function can be called twice during one spell hit (Area of Effect spells)
+                    // Make sure 28682 wasn't already removed by previous call
+                    if (HasAura(28682))
+                        this->CastSpell(this, 28682, true);
+
                     return false; // ordinary chrages will be removed during crit chance computations.
                 }
                 // Empowered Fire
-- 
cgit v1.2.3