josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Revert Damage Shield fix.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-03-17 00:28:22 +01:00
parent 950afd2544
commit 0cb08705b9
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.cpp
+1 -4
View File
@@ -997,12 +997,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
procEx = createProcExtendMask(&damageInfo, missInfo); procEx = createProcExtendMask(&damageInfo, missInfo);
procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE; procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
// Send blocked amount to spell_proc event if proc can be only from block (Damage Shield)
uint32 ProcAmount = procEx == PROC_EX_BLOCK ? damageInfo.blocked : damageInfo.damage;
// Do triggers for unit (reflect triggers passed on hit phase for correct drop charge) // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge)
if (m_canTrigger && missInfo != SPELL_MISS_REFLECT) if (m_canTrigger && missInfo != SPELL_MISS_REFLECT)
caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, ProcAmount, m_attackType, m_spellInfo); caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, damageInfo.damage, m_attackType, m_spellInfo);
caster->DealSpellDamage(&damageInfo, true); caster->DealSpellDamage(&damageInfo, true);
src/game/Unit.cpp
+2 -4
View File
@@ -2376,9 +2376,7 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex
CalculateMeleeDamage(pVictim, 0, &damageInfo, attType); CalculateMeleeDamage(pVictim, 0, &damageInfo, attType);
// Send log damage message to client // Send log damage message to client
SendAttackStateUpdate(&damageInfo); SendAttackStateUpdate(&damageInfo);
// Send blocked amount to spell_proc event if proc can be only from block (Damage Shield) ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, damageInfo.damage, damageInfo.attackType);
uint32 ProcAmount = damageInfo.procEx == PROC_EX_BLOCK ? damageInfo.blocked_amount : damageInfo.damage;
ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, ProcAmount, damageInfo.attackType);
DealMeleeDamage(&damageInfo,true); DealMeleeDamage(&damageInfo,true);
if (GetTypeId() == TYPEID_PLAYER) if (GetTypeId() == TYPEID_PLAYER)
@@ -5553,7 +5551,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
{ {
triggered_spell_id = 59653; triggered_spell_id = 59653;
// % of amount blocked // % of amount blocked
basepoints0 = damage * triggerAmount / 100; basepoints0 = GetShieldBlockValue() * triggerAmount / 100;
break; break;
} }
break; break;