Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp

2 files changed, 8 insertions, 5 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
index b334c5c44b6..f07e426c808 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
@@ -553,7 +553,8 @@ public:
                     loadStream >> tmpState;
                     if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
                         tmpState = NOT_STARTED;
-                        SetBossState(i, EncounterState(tmpState));
+
+                    SetBossState(i, EncounterState(tmpState));
                 }
             }
             else
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index b994821cce9..855ed46e5cf 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -710,12 +710,14 @@ public:
                             {
                                 SpeechTimer = 0;
                                 if (instance)
+                                {
                                     if (Creature* speechCreature = Unit::GetCreature(*me, instance->GetData64(Speeches[speechCount].creature)))
                                         speechCreature->AI()->Talk(Speeches[speechCount].textid);
-                                if (speechCount == 12)
-                                    if (Creature* pAnveena =  Unit::GetCreature(*me, instance->GetData64(DATA_ANVEENA)))
-                                        pAnveena->CastSpell(me, SPELL_SACRIFICE_OF_ANVEENA, false);
-                                        //   ChangeTimers(true, 10000); // Kil should do an emote while screaming without attacking for 10 seconds
+                                    if (speechCount == 12)
+                                        if (Creature* pAnveena =  Unit::GetCreature(*me, instance->GetData64(DATA_ANVEENA)))
+                                            pAnveena->CastSpell(me, SPELL_SACRIFICE_OF_ANVEENA, false);
+                                    //   ChangeTimers(true, 10000); // Kil should do an emote while screaming without attacking for 10 seconds
+                                }
                                 if (speechCount == speechPhaseEnd)
                                     TimerIsDeactivated[TIMER_SPEECH]=true;
                                 speechCount++;