From 2641173fbeedc2a3f3900122443587b97626b5e1 Mon Sep 17 00:00:00 2001 From: megamage Date: Sun, 4 Jan 2009 15:27:11 -0600 Subject: [PATCH] *Fix a bug in ScriptedAI::SelectUnitList. --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 3 ++- src/game/SpellMgr.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index b54f91a113..bb7f98c9f7 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -432,7 +432,7 @@ void ScriptedAI::SelectUnitList(std::list &targetList, uint32 num, Select std::list m_threatlist = m_creature->getThreatManager().getThreatList(); std::list::iterator i; Unit *target; - while(m_threatlist.size()) + while(m_threatlist.size() && num) { if(targetType == SELECT_TARGET_BOTTOMAGGRO) { @@ -455,6 +455,7 @@ void ScriptedAI::SelectUnitList(std::list &targetList, uint32 num, Select continue; } targetList.push_back(target); + --num; } } } diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 202682e138..494921eb2a 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2159,7 +2159,6 @@ void SpellMgr::LoadSpellCustomAttr() case 37790: //Spread Shot case 46771: //Flame Sear case 45248: //Shadow Blades - case 39835: //Needle Spine spellInfo->MaxAffectedTargets = 3; break; case 38310: //Multi-Shot