merge

--HG--
branch : trunk

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp

@@ -632,6 +632,11 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI
             bIsLowHP = true;
         } else if (bIsLowHP && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) > 30)
             bIsLowHP = false;
+
+        if (!UpdateVictim())
+            return;
+
+        DoMeleeAttackIfReady();
     }
 };
 

src/game/Spell.cpp

@@ -1099,9 +1099,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         }
     }
 
-    // Do not take combo points on dodge
+    // Do not take combo points on dodge and miss
     if (m_needComboPoints && m_targets.getUnitTargetGUID() == target->targetGUID)
-        if( missInfo != SPELL_MISS_NONE && missInfo != SPELL_MISS_MISS)
+        if (missInfo != SPELL_MISS_NONE)
             m_needComboPoints = false;
 
     // Trigger info was not filled in spell::preparedatafortriggersystem - we do it now