From 7496a6b91b32b9a72c47a9406ffc08cfb2d1dffa Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sat, 2 Jan 2010 19:18:59 +0300
Subject: [PATCH] [9102] Use FillRaidOrPartyHealthPriorityTargets for 34861 and
 ranks.

---
 src/game/Spell.cpp       | 24 ++++++++++++++----------
 src/shared/revision_nr.h |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 05fa25bd8..3cf1ecdf8 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1346,16 +1346,6 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni
             }
             break;
         }
-        case SPELLFAMILY_PRIEST:
-            if(m_spellInfo->SpellVisual[0] == 8253)         // Circle of Healing
-            {
-                unMaxTargets = 5;
-                
-                // Glyph of Circle of Healing
-                if(Aura const* glyph = m_caster->GetDummyAura(55675))
-                    unMaxTargets += glyph->GetModifier()->m_amount;
-            }
-            break;
         case SPELLFAMILY_DRUID:
         {
             if (m_spellInfo->SpellFamilyFlags2 & 0x00000100)// Starfall
@@ -1747,6 +1737,20 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni
                     if (Unit* target = m_caster->GetMap()->GetPet(((Player*)m_caster)->GetSelection()))
                         targetUnitMap.push_back(target);
             }
+            // Circle of Healing
+            else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->SpellVisual[0] == 8253)
+            {
+                Unit* target = m_targets.getUnitTarget();
+                if(!target)
+                    target = m_caster;
+
+                uint32 count = 5;
+                // Glyph of Circle of Healing
+                if(Aura const* glyph = m_caster->GetDummyAura(55675))
+                    count += glyph->GetModifier()->m_amount;
+
+                FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, target, radius, count, true, false, true);
+            }
             // Wild Growth
             else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellIconID == 2864)
             {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 04b683ea3..6a325fd55 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 "9101"
+ #define REVISION_NR "9102"
 #endif // __REVISION_NR_H__