From 7d0a830bd457191d0afb34bf61a0669865f0c317 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 27 Dec 2009 23:44:25 +0300 Subject: [PATCH] [9076] Another SPELL_EFFECT_PLAYER_PULL problem fix. If base points porvided then this is _max_ pull distance, not direct distance. --- src/game/SpellEffects.cpp | 6 +++++- src/shared/revision_nr.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index c636f07db..4a28ebf47 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -6439,7 +6439,11 @@ void Spell::EffectPlayerPull(uint32 i) if(!unitTarget) return; - unitTarget->KnockBackFrom(m_caster, -float(damage ? damage : unitTarget->GetDistance2d(m_caster)),float(m_spellInfo->EffectMiscValue[i])/10); + float dist = unitTarget->GetDistance2d(m_caster); + if (damage && dist > damage) + dist = damage; + + unitTarget->KnockBackFrom(m_caster,-dist,float(m_spellInfo->EffectMiscValue[i])/10); } void Spell::EffectDispelMechanic(uint32 i) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0e2c36978..ab8406b93 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9075" + #define REVISION_NR "9076" #endif // __REVISION_NR_H__