Update PlayerbotFactory.cpp

src/factory/PlayerbotFactory.cpp

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