diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2016-08-20 12:43:04 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-12 16:24:25 +0100 |
| commit | 346e4824beee7e23c5e93d94c72f38ec1cd06dbc (patch) | |
| tree | 230102f9e28c8e46a385359b6e45047fac4c14e5 /src/server/game/Spells/SpellInfo.cpp | |
| parent | 1091174f0363f730bc720185999edf120e92c50e (diff) | |
Entities/Unit: Cleanup refactor. Changes: (#17819)
+ Unit::m_movedPlayer -> Unit::m_playerMovingMe
+ Player::m_mover -> Player::m_unitMovedByMe
+ Unit::GetMover() -> Unit::GetUnitBeingMoved()
+ Unit::GetPlayerMover() -> Unit::GetPlayerBeingMoved()
+ NEW: Unit::GetClientControllingPlayer()
(cherry picked from commit 8deda7ed7f18615937ec5db2d30a6badc3b157c1)
# Conflicts:
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Entities/Unit/Unit.cpp
# src/server/game/Handlers/MiscHandler.cpp
# src/server/game/Handlers/MovementHandler.cpp
# src/server/game/Handlers/SpellHandler.cpp
# src/server/game/Server/WorldSession.cpp
# src/server/game/Spells/SpellEffects.cpp
# src/server/game/Spells/SpellInfo.cpp
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 2ddd12fc376..370cea97be1 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -555,8 +555,8 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster /*= nullptr*/, int32 const* if (caster) { // bonus amount from combo points - if (caster->m_movedPlayer && comboDamage) - if (uint32 comboPoints = caster->m_movedPlayer->GetComboPoints()) + if (caster->m_playerMovingMe && comboDamage) + if (uint32 comboPoints = caster->m_playerMovingMe->GetComboPoints()) value += comboDamage * comboPoints; value = caster->ApplyEffectModifiers(_spellInfo, EffectIndex, value); |
