[7927] For achievement criteria type ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM check also items equip at loading. Author: VladimirMangos

--HG--
branch : trunk

2 files changed, 3 insertions, 1 deletions

diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index 1a0d4f8c15e..c2eb744d3f1 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -1065,7 +1065,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 if(miscvalue1 != achievementCriteria->equip_item.itemID)
                     continue;
 
-                SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
+                SetCriteriaProgress(achievementCriteria, 1);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT:
                 // miscvalue1 = go entry
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 49da25bb634..ad7635d39de 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -10606,6 +10606,8 @@ void Player::QuickEquipItem( uint16 pos, Item *pItem)
             pItem->AddToWorld();
             pItem->SendUpdateToPlayer( this );
         }
+
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
     }
 }