src/factory/PlayerbotFactory.cpp

@@ -164,33 +164,22 @@ void PlayerbotFactory::Init()
         {
             continue;
         }
-        
         ItemTemplate const* proto = sObjectMgr->GetItemTemplate(gemId);
-        if (!proto)
-        {
-            continue;
-        }
 
         if (proto->ItemLevel < 60)
-        {
             continue;
-        }
 
         if (proto->Flags & ITEM_FLAG_UNIQUE_EQUIPPABLE)
         {
             continue;
         }
-        
         if (sRandomItemMgr->IsTestItem(gemId))
-        {
+            continue;
-           continue;
-        }
 
-        if (!sGemPropertiesStore.LookupEntry(proto->GemProperties))
+        if (!proto || !sGemPropertiesStore.LookupEntry(proto->GemProperties))
         {
             continue;
         }
-        
         // LOG_INFO("playerbots", "Add {} to enchantment gems", gemId);
         enchantGemIdCache.push_back(gemId);
     }
@@ -1028,17 +1017,14 @@ void PlayerbotFactory::ClearSkills()
     }
     bot->SetUInt32Value(PLAYER_SKILL_INDEX(0), 0);
     bot->SetUInt32Value(PLAYER_SKILL_INDEX(1), 0);
-    
     // unlearn default race/class skills
-    if (PlayerInfo const* info = sObjectMgr->GetPlayerInfo(bot->getRace(), bot->getClass()))
+    PlayerInfo const* info = sObjectMgr->GetPlayerInfo(bot->getRace(), bot->getClass());
+    for (PlayerCreateInfoSkills::const_iterator itr = info->skills.begin(); itr != info->skills.end(); ++itr)
     {
-        for (PlayerCreateInfoSkills::const_iterator itr = info->skills.begin(); itr != info->skills.end(); ++itr)
+        uint32 skillId = itr->SkillId;
-        {
+        if (!bot->HasSkill(skillId))
-            uint32 skillId = itr->SkillId;
+            continue;
-            if (!bot->HasSkill(skillId))
+        bot->SetSkill(skillId, 0, 0, 0);
-                continue;
-            bot->SetSkill(skillId, 0, 0, 0);
-        }
     }
 }