Core/Spells: Fix erraneous behaviour on hunter spell Lock and Load (disable charge-drop) - thanks to Dr. Tenma

Closes issue 3307

--HG--
branch : trunk

1 files changed, 8 insertions, 1 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 3245b707129..a92da8470b5 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -6680,6 +6680,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 if (!procSpell)
                     return false;
 
+                Spell * spell = ToPlayer()->m_spellModTakingSpell;
+
+                // Disable charge drop because of Lock and Load
+                ToPlayer()->SetSpellModTakingSpell(spell, false);
+
                 // Explosive Shot
                 if (procSpell->SpellFamilyFlags[2] & 0x200)
                 {
@@ -6688,10 +6693,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 }
                 else
                     basepoints0 = CalculatePowerCost(procSpell, this, SpellSchoolMask(procSpell->SchoolMask)) * 4/10;
+
+                ToPlayer()->SetSpellModTakingSpell(spell, true);
+
                 if (basepoints0 <= 0)
                     return false;
 
-                basepoints0 += 1;   // standard basepoint increase for CastCustomSpell
                 target = this;
                 triggered_spell_id = 34720;
                 break;