From 3703f4891def906b405d37787b7b993e2a652491 Mon Sep 17 00:00:00 2001
From: mknjc <none@none>
Date: Thu, 7 May 2009 18:20:55 +0200
Subject: [PATCH] Backported TC2 commit 3157 (megamage: *Fix the bug that
 fishing bobber does not have correct position.)

--HG--
branch : trunk
---
 src/game/Spell.cpp  | 14 ++++++++++++--
 src/game/SpellMgr.h |  6 ++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 91d6622425..664e52b26c 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1593,9 +1593,19 @@ void Spell::SetTargetMap(uint32 i, uint32 cur)
             switch(cur)
             {
                 case TARGET_UNIT_CASTER:
-                case TARGET_UNIT_CASTER_FISHING:
                     AddUnitTarget(m_caster, i);
                     break;
+                case TARGET_UNIT_CASTER_FISHING:
+                {
+                    AddUnitTarget(m_caster, i);                   
+                    float min_dis = GetSpellMinRange(m_spellInfo, true);
+                    float max_dis = GetSpellMaxRange(m_spellInfo, true);
+                    float dis = rand_norm() * (max_dis - min_dis) + min_dis;
+                    float x, y, z;
+                    m_caster->GetClosePoint(x, y, z, DEFAULT_WORLD_OBJECT_SIZE, dis);
+                    m_targets.setDestination(x, y, z);
+                    break;
+                }
                 case TARGET_UNIT_MASTER:
                     if(Unit* owner = m_caster->GetCharmerOrOwner())
                         AddUnitTarget(owner, i);
@@ -2471,7 +2481,7 @@ void Spell::_handle_immediate_phase()
     {
         if(spellmgr.EffectTargetType[m_spellInfo->Effect[j]] == SPELL_REQUIRE_DEST)
         {
-            if(!m_targets.HasDst())
+            if(!m_targets.HasDst()) // FIXME: this will ignore dest set in effect
                 m_targets.setDestination(m_caster);
             HandleEffects(m_originalCaster, NULL, NULL, j);
         }
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 70b81403a5..7c5a0874e4 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -326,6 +326,12 @@ inline bool IsSpellHaveEffect(SpellEntry const *spellInfo, SpellEffects effect)
             return true;
     return false;
 }
+inline float GetSpellMinRange(SpellEntry const *spellInfo, bool positive)
+{
+    return positive
+        ? GetSpellMinRangeForFriend(sSpellRangeStore.LookupEntry(spellInfo->rangeIndex))
+        : GetSpellMinRangeForHostile(sSpellRangeStore.LookupEntry(spellInfo->rangeIndex));
+}
 
 //bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 effIndex_1, uint32 spellId_2, uint32 effIndex_2);