From 7af628bccc2b6a58d249daa5efe891951130f7c7 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 7 Dec 2021 14:21:03 -0500
Subject: [PATCH] Core/Achievement: correctly credit progress for skill-related
 achievements when learning a new skill.

Port From (https://github.com/TrinityCore/TrinityCore/commit/3264ef1f75af2430301050df3831e20c51ecf512)
---
 Source/Game/Entities/Player/Player.Spells.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/Game/Entities/Player/Player.Spells.cs b/Source/Game/Entities/Player/Player.Spells.cs
index e247b1dce..edcc4df10 100644
--- a/Source/Game/Entities/Player/Player.Spells.cs
+++ b/Source/Game/Entities/Player/Player.Spells.cs
@@ -1205,9 +1205,6 @@ namespace Game.Entities
 
                 if (newVal != 0)
                 {
-                    UpdateCriteria(CriteriaType.SkillRaised, id);
-                    UpdateCriteria(CriteriaType.AchieveSkillStep, id);
-
                     // temporary bonuses
                     foreach (var auraEffect in GetAuraEffectsByType(AuraType.ModSkill))
                         if (auraEffect.GetMiscValue() == id)
@@ -1224,6 +1221,8 @@ namespace Game.Entities
 
                     // Learn all spells for skill
                     LearnSkillRewardedSpells(id, newVal);
+                    UpdateCriteria(CriteriaType.SkillRaised, id);
+                    UpdateCriteria(CriteriaType.AchieveSkillStep, id);
                 }
             }
         }