sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Spells: Regenerating POWER_HAPPINESS should not generate additional threat. (#7146)

Browse Source 
Fixed #6190

Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
UltraNix
2021-08-04 16:56:47 +02:00
committed by GitHub
parent 49cc3777e9
commit 8522809bb3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+3
View File
@@ -10719,9 +10719,12 @@ void Unit::EnergizeBySpell(Unit* victim, uint32 spellID, uint32 damage, Powers p
// needs to be called after sending spell log // needs to be called after sending spell log
victim->ModifyPower(powerType, damage); victim->ModifyPower(powerType, damage);
if (powerType != POWER_HAPPINESS)
{
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellID); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellID);
victim->getHostileRefManager().threatAssist(this, float(damage) * 0.5f, spellInfo); victim->getHostileRefManager().threatAssist(this, float(damage) * 0.5f, spellInfo);
} }
}
float Unit::SpellPctDamageModsDone(Unit* victim, SpellInfo const* spellProto, DamageEffectType damagetype) float Unit::SpellPctDamageModsDone(Unit* victim, SpellInfo const* spellProto, DamageEffectType damagetype)
{ {