From da81f2ccd80fc250fa584345efc4e7eb9af545f7 Mon Sep 17 00:00:00 2001
From: Paradox <none@none>
Date: Tue, 5 Jan 2010 16:18:27 -0500
Subject: [PATCH 1/3] Fix CRLF

--HG--
branch : trunk
---
 sql/updates/6898_world_spell_proc_event.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/updates/6898_world_spell_proc_event.sql b/sql/updates/6898_world_spell_proc_event.sql
index 2dda27a4a7..4751b9d29b 100644
--- a/sql/updates/6898_world_spell_proc_event.sql
+++ b/sql/updates/6898_world_spell_proc_event.sql
@@ -1,2 +1,2 @@
-DELETE FROM spell_proc_event WHERE entry = 58387;
+DELETE FROM spell_proc_event WHERE entry = 58387;
 INSERT INTO spell_proc_event VALUES(58387, 0, 4, 16384, 64, 0, 16, 0, 0, 0, 0); -- Glyph of Sunder Armor
\ No newline at end of file

From b56b2c2a4339073456290079fc4bfb2bf0b6b5ed Mon Sep 17 00:00:00 2001
From: Astellar <none@none>
Date: Wed, 6 Jan 2010 00:26:15 +0300
Subject: [PATCH 2/3] Fixed Issue 11. Now combo points are kept when finishing
 move misses. Revert it if it's wrong.

--HG--
branch : trunk
---
 src/game/Spell.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 9aa54f9b14..1d855f727c 100644
--- a/src/game/Spell.cpp
+++ b/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

From 0bd566213a74214553ca734ab08f4b8cd9430559 Mon Sep 17 00:00:00 2001
From: _manuel_ <none@none>
Date: Tue, 5 Jan 2010 21:49:48 -0300
Subject: [PATCH 3/3] Halls of Stone: Prevents Brann Bronzebeard stuck in
 combat.

--HG--
branch : trunk
---
 .../northrend/ulduar/halls_of_stone/halls_of_stone.cpp       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
index aff7a1a45b..a8141edb98 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
+++ b/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();
     }
 };