Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
This commit is contained in:
Vincent-Michael committed 2014-08-26 19:21:22 +02:00
commit 741f3dde2e
334 files changed
+487 -198930

No files matched your search

+12 -1
View File
@@ -12708,7 +12708,18 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
// Remove charge (aura can be removed by triggers)
if (prepare && useCharges && takeCharges)
i->aura->DropCharge();
{
// Set charge drop delay (only for missiles)
if ((procExtra & PROC_EX_REFLECT) && target && procSpell && procSpell->Speed > 0.0f)
{
// Set up missile speed based delay (from Spell.cpp: Spell::AddUnitTarget()::L2237)
uint32 delay = uint32(std::floor(std::max<float>(target->GetDistance(this), 5.0f) / procSpell->Speed * 1000.0f));
// Schedule charge drop
i->aura->DropChargeDelayed(delay);
}
else
i->aura->DropCharge();
}
i->aura->CallScriptAfterProcHandlers(aurApp, eventInfo);