Merge branch 'master' of https://github.com/ZhengPeiRu21/mod-individual-progression

sql/world/base/naxx40_omarian.sql

@@ -1,5 +1,5 @@
 -- Handle gossip with cpp script
-UPDATE `creature_template` SET `ScriptName`='npc_omarion_gossip',`gossip_menu_id`=0 WHERE `entry` = 16365;
+UPDATE `creature_template` SET `ScriptName`='npc_omarion_gossip',`gossip_menu_id`=0, `faction`=1766 WHERE `entry` = 16365;
 
 SET @ID:= 24400;
 -- Set correct text when gossip tailor/leatherwork/blacksmith option

src/naxx40Scripts/instance_naxxramas.cpp

@@ -724,6 +724,16 @@ public:
             return true;
         }
 
+        void Load(const char* data) override
+        {
+            _horsemanLoadDoneState = true;
+            InstanceScript::Load(data);
+            if (GetBossState(BOSS_HORSEMAN) != DONE)
+            {
+                _horsemanLoadDoneState = false;
+            }
+        }
+
         bool SetBossState(uint32 bossId, EncounterState state) override
         {
             // pull all the trash if not killed
@@ -743,9 +753,9 @@ public:
             }
 
             // Horseman handling
-            if (bossId == BOSS_HORSEMAN && !_horsemanLoadDoneState)
+            if (bossId == BOSS_HORSEMAN)
             {
-                if (state == DONE)
+                if (state == DONE && !_horsemanLoadDoneState)
                 {
                     _horsemanTimer++;
                     _horsemanKilled++;