Skip to content
Browse files

[8712] Fixed commit [8708]

* Now final damage counted also with spell bonus.

Thanks Corfen for pointing this out.

Signed-off-by: ApoC <apoc@nymfe.net>
  • Loading branch information...
1 parent b333b63 commit 0dc2ce28a9db8b1f02edbe676ce33cab4fde585c @apoc apoc committed
Showing with 12 additions and 13 deletions.
  1. +1 −1 sql/mangos_spell_check.sql
  2. +0 −11 src/game/SpellAuras.cpp
  3. +10 −0 src/game/Unit.cpp
  4. +1 −1 src/shared/revision_nr.h
View
2 sql/mangos_spell_check.sql
@@ -345,7 +345,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas
/*id fm familyMaskA fmMaskB icon vis cat eff aur ef name code */
( 0, 3,0x0000000020000000,0x00000000, -1, -1, -1, 2, -1,-1,'Arcane Blast', 'Spell::EffectSchoolDMG'),
( 0, 9,0x0000000000000800,0x00000000, -1, -1, -1, 2, -1,-1,'Arcane Shot', 'Spell::EffectSchoolDMG'),
-( 0, 5,0x0000000000004000,0x00000000, -1, -1, -1, -1, -1,-1,'Drain Soul', 'Aura::HandlePeriodicDamage'),
+( 0, 5,0x0000000000004000,0x00000000, -1, -1, -1, -1, -1,-1,'Drain Soul', 'Unit::SpellDamageBonus'),
( 0,10,0x0000000000004000,0x00000000, -1, -1, -1, 2, -1,-1,'Avenger\'s Shield', 'Spell::EffectSchoolDMG'),
( 0, 4,0x0000040000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Bloodthirst', 'Spell::EffectSchoolDMG'),
(0, 4,0x0000000000000001,0x00000000, -1, 867, -1, 3, -1,-1,'Charge', 'Spell::EffectDummy'),
View
11 src/game/SpellAuras.cpp
@@ -4509,17 +4509,6 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
}
break;
}
- case SPELLFAMILY_WARLOCK:
- {
- // Drain Soul
- if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000))
- {
- if (m_target->GetHealth() * 100 / m_target->GetMaxHealth() <= 25)
- m_modifier.m_amount *= 4;
- return;
- }
- break;
- }
case SPELLFAMILY_DRUID:
{
// Rake
View
10 src/game/Unit.cpp
@@ -8348,6 +8348,16 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
}
break;
}
+ case SPELLFAMILY_WARLOCK:
+ {
+ // Drain Soul
+ if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000))
+ {
+ if (pVictim->GetHealth() * 100 / pVictim->GetMaxHealth() <= 25)
+ DoneTotalMod *= 4;
+ }
+ break;
+ }
case SPELLFAMILY_DEATHKNIGHT:
{
// Icy Touch, Howling Blast and Frost Strike
View
2 src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "8711"
+ #define REVISION_NR "8712"
#endif // __REVISION_NR_H__

0 comments on commit 0dc2ce2

Please sign in to comment.
Something went wrong with that request. Please try again.