diff options
| -rw-r--r-- | sql/updates/1159_world.sql | 10 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/sql/updates/1159_world.sql b/sql/updates/1159_world.sql new file mode 100644 index 00000000000..b237e0422c4 --- /dev/null +++ b/sql/updates/1159_world.sql @@ -0,0 +1,10 @@ +DELETE from `spell_affect` where entry=16999; +DELETE from `spell_affect` where entry=16998; +INSERT INTO `spell_affect` VALUES (16998, 0, 0x40000001000); +INSERT INTO `spell_affect` VALUES (16998, 1, 0x40000001000); +INSERT INTO `spell_affect` VALUES (16998, 2, 0x40000001000); +INSERT INTO `spell_affect` VALUES (16999, 0, 0x40000001000); +INSERT INTO `spell_affect` VALUES (16999, 1, 0x40000001000); +INSERT INTO `spell_affect` VALUES (16999, 2, 0x40000001000); + + diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 0fb9426870a..a3fc2400208 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -8703,6 +8703,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 } } + bool hasmangle=false; // .. taken pct: dummy auras AuraList const& mDummyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY); for(AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) @@ -8725,6 +8726,10 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 //Mangle case 2312: case 44955: + // don't apply mod twice + if (hasmangle) + break; + hasmangle=true; for(int j=0;j<3;j++) { if(GetEffectMechanic(spellProto, j)==MECHANIC_BLEED) |