nullptr exception

src/Playerbots.cpp

@@ -209,30 +209,16 @@ public:
 
     void OnPlayerGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 /*xpSource*/) override
     {
-        // early return
-        if (sPlayerbotAIConfig->randomBotXPRate == 1.0 || !player)
+        if (!player->GetSession()->IsBot())
+            return;
+        
+        if (!sRandomPlayerbotMgr->IsRandomBot(player))
             return;
 
-        // no XP multiplier, when player is no bot.
-        if (!player->GetSession()->IsBot() || !sRandomPlayerbotMgr->IsRandomBot(player))
-            return;
-
-        // no XP multiplier, when bot has group where leader is a real player.
-        if (Group* group = player->GetGroup())
+        if (sPlayerbotAIConfig->randomBotXPRate != 1.0)
         {
-            Player* leader = group->GetLeader();
-            if (leader && leader != player)
-            {
-                if (PlayerbotAI* leaderBotAI = GET_PLAYERBOT_AI(leader))
-                {
-                    if (leaderBotAI->HasRealPlayerMaster())
-                        return;
-                }
-            }
+            amount = static_cast<uint32>(std::round(static_cast<float>(amount) * sPlayerbotAIConfig->randomBotXPRate));
         }
-
-        // otherwise apply bot XP multiplier.
-        amount = static_cast<uint32>(std::round(static_cast<float>(amount) * sPlayerbotAIConfig->randomBotXPRate));
     }
 };
 

src/factory/PlayerbotFactory.cpp

@@ -164,15 +164,16 @@ void PlayerbotFactory::Init()
         {
             continue;
         }
+        
         ItemTemplate const* proto = sObjectMgr->GetItemTemplate(gemId);
+        if (proto) {
+            if (proto->ItemLevel < 60)
+                continue;
 
-        if (proto->ItemLevel < 60)
-            continue;
-
-        if (proto->Flags & ITEM_FLAG_UNIQUE_EQUIPPABLE)
-        {
-            continue;
+            if (proto->Flags & ITEM_FLAG_UNIQUE_EQUIPPABLE)
+               continue;
         }
+        
         if (sRandomItemMgr->IsTestItem(gemId))
             continue;
 
@@ -180,9 +181,11 @@ void PlayerbotFactory::Init()
         {
             continue;
         }
+        
         // LOG_INFO("playerbots", "Add {} to enchantment gems", gemId);
         enchantGemIdCache.push_back(gemId);
     }
+    
     LOG_INFO("playerbots", "Loading {} enchantment gems", enchantGemIdCache.size());
 }
 
@@ -1017,18 +1020,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()