mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 310

Browse source 
Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2009-04-07 13:22:10 +04:00
commit 14e9afa46f
43 changed files with 4445 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/SpellEffects.cpp
View file

@ -373,7 +373,7 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100);
}
// Shield Slam
else if(m_spellInfo->SpellFamilyFlags & 0x0000020000000000LL)
else if(m_spellInfo->SpellFamilyFlags & 0x0000020000000000LL && m_spellInfo->Category==1209)
damage += int32(m_caster->GetShieldBlockValue());
// Victory Rush
else if(m_spellInfo->SpellFamilyFlags & 0x10000000000LL)