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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp

2 files changed, 29 insertions, 0 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 382a0002065..ab1367ed684 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -311,6 +311,23 @@ public:
     {
         npc_highlord_darion_mograineAI(Creature* creature) : npc_escortAI(creature)
         {
+            uiTirionGUID = 0;
+            uiKorfaxGUID = 0;
+            uiMaxwellGUID = 0;
+            uiEligorGUID = 0;
+            uiRayneGUID = 0;
+            uiKoltiraGUID = 0;
+            uiOrbazGUID = 0;
+            uiThassarianGUID = 0;
+            uiLichKingGUID = 0;
+
+            memset(uiDefenderGUID, 0, sizeof(uiDefenderGUID));
+            memset(uiEarthshatterGUID, 0, sizeof(uiEarthshatterGUID));
+            memset(uiAbominationGUID, 0, sizeof(uiAbominationGUID));
+            memset(uiBehemothGUID, 0, sizeof(uiBehemothGUID));
+            memset(uiGhoulGUID, 0, sizeof(uiGhoulGUID));
+            memset(uiWarriorGUID, 0, sizeof(uiWarriorGUID));
+
             Reset();
         }
 
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 94e448bd9bc..6cd5e962c02 100644
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -279,6 +279,17 @@ class achievement_flirt_with_disaster_perf_check : public AchievementCriteriaScr
         }
 };
 
+class achievement_killed_exp_or_honor_target : public AchievementCriteriaScript
+{
+    public:
+        achievement_killed_exp_or_honor_target() : AchievementCriteriaScript("achievement_killed_exp_or_honor_target") { }
+
+        bool OnCheck(Player* player, Unit* target) OVERRIDE
+        {
+            return target && player->isHonorOrXPTarget(target);
+        }
+};
+
 void AddSC_achievement_scripts()
 {
     new achievement_resilient_victory();
@@ -298,4 +309,5 @@ void AddSC_achievement_scripts()
     new achievement_tilted();
     new achievement_not_even_a_scratch();
     new achievement_flirt_with_disaster_perf_check();
+    new achievement_killed_exp_or_honor_target();
 }