[9365] [patch]Master Poisoner

[Auntie Mangos]

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

fixes Master Poisoner

For which repository revision was the patch created?

9006

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

http://getmangos.eu/community/showthread.php?p=96585#post96585

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

me(posted my old one from mangos.ru)

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 5246d91..ee0443e 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -559,12 +559,31 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
                        // count consumed deadly poison doses at target
                        if (poison)
                        {
+                            bool needConsume = true;
                            uint32 spellId = poison->GetId();
                            uint32 doses = poison->GetStackAmount();
                            if (doses > combo)
                                doses = combo;
-                            for (int i=0; i< doses; i++)
-                                unitTarget->RemoveSingleSpellAurasFromStack(spellId);
+
+                            // Master Poisoner
+                            Unit::AuraList const& auraList = ((Player*)m_caster)->GetAurasByType(SPELL_AURA_MOD_DURATION_OF_EFFECTS_BY_DISPEL);
+                            for(Unit::AuraList::const_iterator iter = auraList.begin(); iter!=auraList.end(); ++iter)
+                            {
+                                if( (*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_ROGUE && (*iter)->GetSpellProto()->SpellIconID == 1960)
+                                {
+                                    uint32 chance = (*iter)->GetSpellProto()->CalculateSimpleValue(2);
+
+                                    if(chance && roll_chance_i(chance))
+                                        needConsume = false;
+
+                                    break;
+                                }
+                            }
+
+                            if(needConsume)
+                                for (int i=0; i< doses; i++)
+                                    unitTarget->RemoveSingleSpellAurasFromStack(spellId);
+
                            damage *= doses;
                            damage += int32(((Player*)m_caster)->GetTotalAttackPowerValue(BASE_ATTACK) * 0.09f * doses);
                        }

[bulek]

works fine with 9013:)

[nikko]

Yes, works ok

[DLeonHeart]

bump, this patch is really nice dont let it get forgotten

[bulek]

bump, still working with latest rev, no crashes no any problem

[xingbarking]

good patch

[VladimirMangos]

In [9365]. Thank you