[patch] Eclipse

[KAPATEJIb]

What bug does the patch fix? What features does the patch add?

fixed

Both effects cannot occur simultaneously.

for talent http://www.wowhead.com/?spell=48516

For which repository revision was the patch created?

9062

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

no

Who has been writing this patch? Please include either forum user names or email addresses.

Me

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 15cbf8c..616ca27 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5841,6 +5841,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                // Wrath crit
                if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000001))
                {
+                    if (this->HasAura(48517))
+                        return false;
                    if (!roll_chance_i(60))
                        return false;
                    triggered_spell_id = 48518;
@@ -5850,6 +5852,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                // Starfire crit
                if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000004))
                {
+                    if (this->HasAura(48518))
+                        return false;
                    triggered_spell_id = 48517;
                    target = this;
                    break;

Also i can't understand why

                     if (!roll_chance_i(60))
                        return false;

is used? This broke a chance to proc for 1 and 3 rank of talent, maybe we should add a

switch (auraSpellInfo->Id)

then make a case for every rank with their chances (20% for 1, 40% for 2, 60% for 3)?

[KAPATEJIb]

maybe "accepted in [9071]"?

[cyrex]

Both effects cannot occur simultaneously.                      

Damn. Today i notices that and i said Whohoo both proc for me. Now you killed my dream.../cry