From 3264ef1f75af2430301050df3831e20c51ecf512 Mon Sep 17 00:00:00 2001
From: Wyrserth <43747507+Wyrserth@users.noreply.github.com>
Date: Tue, 7 May 2019 10:45:37 +0200
Subject: [PATCH] Core/Achievement: correctly credit progress for skill-related
 achievements when learning a new skill. (#23249)

(cherry picked from commit 0a25069db4fd359619fed219e86f7842104677d0)
---
 src/server/game/Entities/Player/Player.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 11a37491c8d..89f29896607 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -5853,9 +5853,6 @@ void Player::SetSkill(uint16 id, uint16 step, uint16 newVal, uint16 maxVal)
 
         if (newVal)
         {
-            UpdateCriteria(CriteriaType::SkillRaised, id);
-            UpdateCriteria(CriteriaType::AchieveSkillStep, id);
-
             // temporary bonuses
             for (AuraEffect* effect : GetAuraEffectsByType(SPELL_AURA_MOD_SKILL))
                 if (effect->GetMiscValue() == int32(id))
@@ -5872,6 +5869,8 @@ void Player::SetSkill(uint16 id, uint16 step, uint16 newVal, uint16 maxVal)
 
             // Learn all spells for skill
             LearnSkillRewardedSpells(id, newVal);
+            UpdateCriteria(CriteriaType::SkillRaised, id);
+            UpdateCriteria(CriteriaType::AchieveSkillStep, id);
         }
     }
 }