Merge branch '4.x' of git://github.com/TrinityCore/TrinityCore into 4.x

15 files changed, 63 insertions, 54 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index fd84c1eec8a..f73e9779248 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -54,8 +54,10 @@ enum eSpells
 
     SPELL_BLACK_KNIGHT_RES  = 67693,
 
-    SPELL_LEAP                = 67749,
-    SPELL_LEAP_H            = 67880
+    SPELL_LEAP              = 67749,
+    SPELL_LEAP_H            = 67880,
+
+    SPELL_KILL_CREDIT       = 68663
 };
 
 enum eModels
@@ -288,6 +290,8 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
+            DoCast(me, SPELL_KILL_CREDIT);
+
             if (instance)
                 instance->SetData(BOSS_BLACK_KNIGHT, DONE);
         }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index 2fbe381fed5..2f6a01e73d7 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -839,7 +839,8 @@ public:
                 if (target && me->IsInRange(target, 5.0f, 30.0f, false))
                 {
                     DoCast(target, SPELL_MULTI_SHOT);
-                } else
+                }
+                else
                 {
                     Map::PlayerList const& players = me->GetMap()->GetPlayers();
                     if (me->GetMap()->IsDungeon() && !players.isEmpty())
@@ -849,7 +850,7 @@ public:
                             Player* player = itr->getSource();
                             if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false))
                             {
-                                DoCast(target, SPELL_MULTI_SHOT);
+                                DoCast(player, SPELL_MULTI_SHOT);
                                 break;
                             }
                         }
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index e552341fd1e..d877bbd0842 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -237,7 +237,8 @@ public:
                 for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                     if (Player* player = i->getSource())
                         player->DeMorph();
-                instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK);
+
+                DoCast(me, SPELL_ACHIEVEMENT_CHECK);
 
                 instance->SetData(DATA_THARON_JA_EVENT, DONE);
             }
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index eacb800f15a..1e29ec55dc8 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -215,7 +215,6 @@ class mob_corrupted_soul_fragment : public CreatureScript
                         if (Creature* bronjahm = ObjectAccessor::GetCreature(*me, BronjahmGUID))
                             me->CastSpell(bronjahm, SPELL_CONSUME_SOUL, true);
 
-                        summ->GetMotionMaster()->MoveIdle();
                         summ->UnSummon();
                     }
                 }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index c2107e88b2e..9096282c3f6 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -111,7 +111,7 @@ public:
         {
             _EnterCombat();
             DoScriptText(SAY_AGGRO, me);
-            events.ScheduleEvent(EVENT_IMPALE, 10000 + rand()%10000);
+            events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000));
             events.ScheduleEvent(EVENT_LOCUST, 90000);
             events.ScheduleEvent(EVENT_BERSERK, 600000);
 
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index 04627981ef3..b7d74c02dd8 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -107,7 +107,7 @@ public:
                 events.ScheduleEvent(EVENT_CURSE, 10000+rand()%15000);
                 events.ScheduleEvent(EVENT_WARRIOR, 30000);
                 if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
-                    events.ScheduleEvent(EVENT_BLINK, 20000 + rand()%20000);
+                    events.ScheduleEvent(EVENT_BLINK, urand(20000, 40000));
             }
         }
 
@@ -153,7 +153,7 @@ public:
                 {
                     case EVENT_CURSE:
                         DoCastAOE(SPELL_CURSE_PLAGUEBRINGER);
-                        events.ScheduleEvent(EVENT_CURSE, 50000 + rand()%10000);
+                        events.ScheduleEvent(EVENT_CURSE, urand(50000, 60000));
                         return;
                     case EVENT_WARRIOR:
                         DoScriptText(SAY_SUMMON, me);
@@ -173,7 +173,7 @@ public:
                         me->RemoveAllAuras();
                         me->NearTeleportTo(TELE_X, TELE_Y, TELE_Z, TELE_O);
                         events.Reset();
-                        events.ScheduleEvent(EVENT_WAVE, 2000 + rand()%3000);
+                        events.ScheduleEvent(EVENT_WAVE, urand(2000, 5000));
                         waveCount = 0;
                         return;
                     case EVENT_WAVE:
@@ -188,7 +188,7 @@ public:
                                     SummonUndead(MOB_GUARDIAN, RAID_MODE(5, 10));break;
                         }
                         ++waveCount;
-                        events.ScheduleEvent(waveCount < 2 ? EVENT_WAVE : EVENT_GROUND, 30000 + rand()%15000);
+                        events.ScheduleEvent(waveCount < 2 ? EVENT_WAVE : EVENT_GROUND, urand(30000, 45000));
                         return;
                     case EVENT_GROUND:
                     {
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index 8c97766f787..5e2b6551f84 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -131,7 +131,7 @@ public:
             m_uiChargingStatus = 0;
             m_uiCharge_Timer = 1000;
 
-            m_uiChangeStance_Timer = 20000 + rand()%5000;
+            m_uiChangeStance_Timer = urand(20000, 25000);
 
             m_uiReflection_Timer = 8000;
             m_uiKnockAway_Timer = 20000;
@@ -252,7 +252,7 @@ public:
                         break;
                 }
 
-                m_uiChangeStance_Timer = 20000 + rand()%5000;
+                m_uiChangeStance_Timer = urand(20000, 25000);
                 return;
             }
             else
@@ -265,7 +265,7 @@ public:
                     if (m_uiReflection_Timer <= uiDiff)
                     {
                         DoCast(me, SPELL_SPELL_REFLECTION);
-                        m_uiReflection_Timer = 8000 + rand()%1000;
+                        m_uiReflection_Timer = urand(8000, 9000);
                     }
                     else
                         m_uiReflection_Timer -= uiDiff;
@@ -273,7 +273,7 @@ public:
                     if (m_uiKnockAway_Timer <= uiDiff)
                     {
                         DoCast(me, SPELL_KNOCK_AWAY);
-                        m_uiKnockAway_Timer = 20000 + rand()%1000;
+                        m_uiKnockAway_Timer = urand(20000, 21000);
                     }
                     else
                         m_uiKnockAway_Timer -= uiDiff;
@@ -281,7 +281,7 @@ public:
                     if (m_uiPummel_Timer <= uiDiff)
                     {
                         DoCast(me->getVictim(), SPELL_PUMMEL);
-                        m_uiPummel_Timer = 10000 + rand()%1000;
+                        m_uiPummel_Timer = urand(10000, 11000);
                     }
                     else
                         m_uiPummel_Timer -= uiDiff;
@@ -289,7 +289,7 @@ public:
                     if (m_uiIronform_Timer <= uiDiff)
                     {
                         DoCast(me, SPELL_IRONFORM);
-                        m_uiIronform_Timer = 25000 + rand()%1000;
+                        m_uiIronform_Timer = urand(25000, 26000);
                     }
                     else
                         m_uiIronform_Timer -= uiDiff;
@@ -302,7 +302,7 @@ public:
                     {
                         //not much point is this, better random target and more often?
                         DoCast(me->getVictim(), SPELL_INTERCEPT);
-                        m_uiIntercept_Timer = 45000 + rand()%1000;
+                        m_uiIntercept_Timer = urand(45000, 46000);
                     }
                     else
                         m_uiIntercept_Timer -= uiDiff;
@@ -310,7 +310,7 @@ public:
                     if (m_uiWhirlwind_Timer <= uiDiff)
                     {
                         DoCast(me, SPELL_WHIRLWIND);
-                        m_uiWhirlwind_Timer = 10000 + rand()%1000;
+                        m_uiWhirlwind_Timer = urand(10000, 11000);
                     }
                     else
                         m_uiWhirlwind_Timer -= uiDiff;
@@ -318,7 +318,7 @@ public:
                     if (m_uiCleave_Timer <= uiDiff)
                     {
                         DoCast(me->getVictim(), SPELL_CLEAVE);
-                        m_uiCleave_Timer = 8000 + rand()%1000;
+                        m_uiCleave_Timer = urand(8000, 9000);
                     }
                     else
                         m_uiCleave_Timer -= uiDiff;
@@ -330,7 +330,7 @@ public:
                     if (m_uiMortalStrike_Timer <= uiDiff)
                     {
                         DoCast(me->getVictim(), SPELL_MORTAL_STRIKE);
-                        m_uiMortalStrike_Timer = 20000 + rand()%1000;
+                        m_uiMortalStrike_Timer = urand(20000, 21000);
                     }
                     else
                         m_uiMortalStrike_Timer -= uiDiff;
@@ -338,7 +338,7 @@ public:
                     if (m_uiSlam_Timer <= uiDiff)
                     {
                         DoCast(me->getVictim(), SPELL_SLAM);
-                        m_uiSlam_Timer = 15000 + rand()%1000;
+                        m_uiSlam_Timer = urand(15000, 16000);
                     }
                     else
                         m_uiSlam_Timer -= uiDiff;
@@ -381,8 +381,8 @@ public:
 
         void Reset()
         {
-            m_uiArcWeld_Timer = 20000 + rand()%1000;
-            m_uiRenewSteel_Timer = 10000 + rand()%1000;
+            m_uiArcWeld_Timer = urand(20000, 21000);
+            m_uiRenewSteel_Timer = urand(10000, 11000);
         }
 
         void EnterCombat(Unit* who)
@@ -406,7 +406,7 @@ public:
             if (m_uiArcWeld_Timer <= uiDiff)
             {
                 DoCast(me->getVictim(), SPELL_ARC_WELD);
-                m_uiArcWeld_Timer = 20000 + rand()%1000;
+                m_uiArcWeld_Timer = urand(20000, 21000);
             }
             else
                 m_uiArcWeld_Timer -= uiDiff;
@@ -421,7 +421,7 @@ public:
                             DoCast(pBjarngrim, SPELL_RENEW_STEEL_N);
                     }
                 }
-                m_uiRenewSteel_Timer = 10000 + rand()%4000;
+                m_uiRenewSteel_Timer = urand(10000, 14000);
             }
             else
                 m_uiRenewSteel_Timer -= uiDiff;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index a5ea1868686..d90704dd352 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -183,7 +183,7 @@ public:
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(target, SPELL_ARC_LIGHTNING);
 
-                m_uiArcLightning_Timer = 15000 + rand()%1000;
+                m_uiArcLightning_Timer = urand(15000, 16000);
             }
             else
                 m_uiArcLightning_Timer -= uiDiff;
@@ -196,7 +196,7 @@ public:
 
                 m_bIsAura = false;
                 m_uiResumePulsingShockwave_Timer = DUNGEON_MODE(5000, 4000); // Pause Pulsing Shockwave aura
-                m_uiLightningNova_Timer = 20000 + rand()%1000;
+                m_uiLightningNova_Timer = urand(20000, 21000);
             }
             else
                 m_uiLightningNova_Timer -= uiDiff;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 375862c141c..65b5d3eaad1 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -80,10 +80,10 @@ public:
         {
             bIsSlam = false;
 
-            uiBoulderTossTimer = 3000 + rand()%6000;
-            uiGroundSpikeTimer = 9000 + rand()%5000;
-            uiGroundSlamTimer = 15000 + rand()%3000;
-            uiStompTimer = 20000 + rand()%9000;
+            uiBoulderTossTimer = urand(3000, 9000);
+            uiGroundSpikeTimer = urand(9000, 14000);
+            uiGroundSlamTimer = urand(15000, 18000);
+            uiStompTimer = urand(20000, 29000);
             uiShatterTimer = 0;
 
             if (instance)
@@ -107,20 +107,20 @@ public:
             {
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     DoCast(target, SPELL_BOULDER_TOSS);
-                uiBoulderTossTimer = 9000 + rand()%6000;
+                uiBoulderTossTimer = urand(9000, 15000);
             } else uiBoulderTossTimer -= diff;
 
             if (uiGroundSpikeTimer <= diff)
             {
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     DoCast(target, SPELL_GROUND_SPIKE);
-                uiGroundSpikeTimer = 12000 + rand()%5000;
+                uiGroundSpikeTimer = urand(12000, 17000);
             } else uiGroundSpikeTimer -= diff;
 
             if (uiStompTimer <= diff)
             {
                 DoCast(me, SPELL_STOMP);
-                uiStompTimer = 20000 + rand()%9000;
+                uiStompTimer = urand(20000, 29000);
             } else uiStompTimer -= diff;
 
             if (uiGroundSlamTimer <= diff)
@@ -128,7 +128,7 @@ public:
                 DoCast(me, SPELL_GROUND_SLAM);
                 bIsSlam = true;
                 uiShatterTimer = 10000;
-                uiGroundSlamTimer = 15000 + rand()%3000;
+                uiGroundSlamTimer = urand(15000, 18000);
             } else uiGroundSlamTimer -= diff;
 
             if (bIsSlam)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index 4ab09dbf67a..4f512089119 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -79,10 +79,10 @@ public:
 
         void Reset()
         {
-            PartingSorrowTimer = 25000 + rand()%5000;
+            PartingSorrowTimer = urand(25000, 30000);
             StormOfGriefTimer = 10000;
             ShockOfSorrowTimer = 20000+rand()%5000;
-            PillarOfWoeTimer = 5000 + rand()%10000;
+            PillarOfWoeTimer = urand(5000, 15000);
 
             if (instance)
             {
@@ -124,14 +124,14 @@ public:
                     if (target)
                         DoCast(target, SPELL_PARTING_SORROW);
 
-                    PartingSorrowTimer = 30000 + rand()%10000;
+                    PartingSorrowTimer = urand(30000, 40000);
                 } else PartingSorrowTimer -= diff;
             }
 
             if (StormOfGriefTimer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_STORM_OF_GRIEF_N, true);
-                StormOfGriefTimer = 15000 + rand()%5000;
+                StormOfGriefTimer = urand(15000, 20000);
             } else StormOfGriefTimer -= diff;
 
             if (ShockOfSorrowTimer <= diff)
@@ -139,7 +139,7 @@ public:
                 DoResetThreat();
                 DoScriptText(SAY_STUN, me);
                 DoCast(me, SPELL_SHOCK_OF_SORROW_N);
-                ShockOfSorrowTimer = 20000 + rand()%10000;
+                ShockOfSorrowTimer = urand(20000, 30000);
             } else ShockOfSorrowTimer -= diff;
 
             if (PillarOfWoeTimer <= diff)
@@ -151,7 +151,7 @@ public:
                 else
                     DoCast(me->getVictim(), SPELL_PILLAR_OF_WOE_N);
 
-                PillarOfWoeTimer = 5000 + rand()%20000;
+                PillarOfWoeTimer = urand(5000, 25000);
             } else PillarOfWoeTimer -= diff;
 
             DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index 41dcd77d4bc..dd61fe549c3 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -115,10 +115,10 @@ public:
             bIsFrenzy = false;
 
             uiEncounterTimer = 0;
-            uiChainLightningTimer = 3000 + rand()%5000;
-            uiLightningShieldTimer = 20000 + rand()%5000;
-            uiStaticChargeTimer = 20000 + rand()%5000;
-            uiLightningRingTimer = 30000 + rand()%5000;
+            uiChainLightningTimer = urand(3000, 8000);
+            uiLightningShieldTimer = urand(20000, 25000);
+            uiStaticChargeTimer = urand(20000, 25000);
+            uiLightningRingTimer = urand(30000, 35000);
             uiSummonTimer = 5000;
             uiFrenzyTimer = 300000; //5 minutes
             abuseTheOoze = 0;
@@ -158,7 +158,7 @@ public:
             {
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     DoCast(target, SPELL_CHAIN_LIGHTING);
-                uiChainLightningTimer = 10000 + rand()%5000;
+                uiChainLightningTimer = urand(10000, 15000);
             } else uiChainLightningTimer -= diff;
 
             if (uiLightningShieldTimer <= diff)
@@ -170,7 +170,7 @@ public:
             if (uiStaticChargeTimer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_STATIC_CHARGE);
-                uiStaticChargeTimer = 20000 + rand()%5000;
+                uiStaticChargeTimer = urand(20000, 25000);
             } uiStaticChargeTimer -= diff;
 
             if (uiLightningRingTimer <= diff)
@@ -178,7 +178,7 @@ public:
                 if (me->IsNonMeleeSpellCasted(false))
                     me->InterruptNonMeleeSpells(false);
                 DoCast(me, SPELL_LIGHTING_RING);
-                uiLightningRingTimer = 30000 + rand()%5000;
+                uiLightningRingTimer = urand(30000, 35000);
             } else uiLightningRingTimer -= diff;
 
             if (uiSummonTimer <= diff)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index ec1464a5d6f..273a0bf6f8e 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -239,7 +239,7 @@ public:
                             summon->CastSpell(target, DUNGEON_MODE(SPELL_DARK_MATTER, H_SPELL_DARK_MATTER), true);
                         }
                     }
-                    uiMarnakEncounterTimer = 30000 + rand()%1000;
+                    uiMarnakEncounterTimer = urand(30000, 31000);
                 } else uiMarnakEncounterTimer -= diff;
             }
             if (bAbedneumActivated)
@@ -255,7 +255,7 @@ public:
                             summon->CastSpell(target, DUNGEON_MODE(SPELL_SEARING_GAZE, H_SPELL_SEARING_GAZE), true);
                         }
                     }
-                    uiAbedneumEncounterTimer = 30000 + rand()%1000;
+                    uiAbedneumEncounterTimer = urand(30000, 31000);
                 } else uiAbedneumEncounterTimer -= diff;
             }
         }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp
index 3888cc43bc9..1892702d336 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp
@@ -143,7 +143,7 @@ public:
 
             uiPhase_timer = 0;
             Ascend_Timer = 480000; //8 minutes
-            QuantumStrike_Timer = 4000 + rand()%10000;
+            QuantumStrike_Timer = urand(4000, 14000);
             Berserk_Timer = 360000; //6 minutes
             CollapsingStar_Timer = urand(15000, 20000); //Spawns between 15 to 20 seconds
             BigBang_Timer = 90000;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index dc2d34326a7..3712bd748a5 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -173,7 +173,11 @@ public:
             DoScriptText(YELL_DEAD_2, me);
 
             if (instance)
+            {
+                // Ingvar has MOB_INGVAR_UNDEAD id in this moment, so we have to update encounter state for his original id
+                instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, MOB_INGVAR_HUMAN, me);
                 instance->SetData(DATA_INGVAR_EVENT, DONE);
+            }
         }
 
         void KilledUnit(Unit* /*victim*/)
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 7b459e7410d..f31271b825e 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -218,7 +218,7 @@ public:
         void JustReachedHome()
         {
             me->SetFlying(false);
-            me->Unmount();
+            me->Dismount();
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
             if (Unit::GetCreature((*me), m_uiGraufGUID) == NULL)
                 me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f);
@@ -285,7 +285,7 @@ public:
                 {
                     Phase = SKADI;
                     me->SetFlying(false);
-                    me->Unmount();
+                    me->Dismount();
                     if (Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS))
                     {
                         pGrauf->GetMotionMaster()->MoveFall(0);