Merge

--HG--
branch : trunk

1 files changed, 8 insertions, 1 deletions

diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
index 31d4170ec3f..ed5d103e3f9 100644
--- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
+++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
@@ -48,7 +48,8 @@ enum Spells
     H_SPELL_LIGHTNING_BREATH                               = 59963,
     SPELL_POISON_CLOUD                                     = 49548,
     H_SPELL_POISON_CLOUD                                   = 59969,
-    SPELL_RETURN_FLESH                                     = 53463 //Channeled spell ending phase two and returning to phase 1. This ability will stun the party for 6 seconds.
+    SPELL_RETURN_FLESH                                     = 53463, //Channeled spell ending phase two and returning to phase 1. This ability will stun the party for 6 seconds.
+    SPELL_ACHIEVEMENT_CHECK                                = 61863,
 };
 /* not needed
 enum PlayerSkills
@@ -247,7 +248,13 @@ struct boss_tharon_jaAI : public ScriptedAI
         DoScriptText(SAY_DEATH,m_creature);
 
         if (pInstance)
+        {
+            // cast is not rewarding the achievement.
+            // DoCast(SPELL_ACHIEVEMENT_CHECK);
+            pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK);
+
             pInstance->SetData(DATA_THARON_JA_EVENT, DONE);
+        }
     }
 };