Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Missing part from thenecromancer's weapon proc patch.

Browse Source 
Some changes in ProcDamageAndSpellFor to allow triggered spells to trigger other for victim.

--HG--
branch : trunk
This commit is contained in:
krz
2009-05-31 01:43:36 +02:00
parent 78228818b7
commit ae5f9ac227
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/Unit.cpp
View File

@@ -1659,7 +1659,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
}
// Do effect if any damage done to target
if (damageInfo->damage)
if (damageInfo->procVictim & PROC_FLAG_TAKEN_ANY_DAMAGE)
{
// victim's damage shield
std::set<Aura*> alreadyDone;
@@ -4725,10 +4725,10 @@ void Unit::SendSpellNonMeleeDamageLog(Unit *target,uint32 SpellID,uint32 Damage,
SendMessageToSet( &data, true );
}
void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const *procSpell)
void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const *procSpell, bool canTrigger)
{
// Not much to do if no flags are set.
if (procAttacker)
if (procAttacker && canTrigger)
ProcDamageAndSpellFor(false,pVictim,procAttacker, procExtra,attType, procSpell, amount);
// Now go on with a victim's events'n'auras
// Not much to do if no flags are set or there is no victim