From cb63f59823e0ebbab80e5a5afb443378fe48649d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= Date: Wed, 23 Mar 2022 16:13:36 -0600 Subject: [PATCH] Prevent crashes when getting PlayerbotMgr --- src/PlayerbotMgr.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/PlayerbotMgr.cpp b/src/PlayerbotMgr.cpp index 37a5aba7..97bdb312 100644 --- a/src/PlayerbotMgr.cpp +++ b/src/PlayerbotMgr.cpp @@ -1023,6 +1023,10 @@ void PlayerbotMgr::CheckTellErrors(uint32 elapsed) void PlayerbotsMgr::AddPlayerbotData(Player* player, bool isBotAI) { + if (!player) + { + return; + } if (!isBotAI) { PlayerbotMgr* playerbotMgr = new PlayerbotMgr(player); @@ -1048,6 +1052,10 @@ void PlayerbotsMgr::RemovePlayerBotData(ObjectGuid const& guid) PlayerbotAI* PlayerbotsMgr::GetPlayerbotAI(Player* player) { + if (!player) + { + return nullptr; + } auto itr = _playerbotsMap.find(player->GetGUID()); if (itr != _playerbotsMap.end()) { @@ -1060,6 +1068,10 @@ PlayerbotAI* PlayerbotsMgr::GetPlayerbotAI(Player* player) PlayerbotMgr* PlayerbotsMgr::GetPlayerbotMgr(Player* player) { + if (!player) + { + return nullptr; + } auto itr = _playerbotsMap.find(player->GetGUID()); if (itr != _playerbotsMap.end()) {