yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix crash caused by bot logout (maybe)

Browse Source
This commit is contained in:
Yunfan Li
2023-09-04 13:02:32 +08:00
parent bb1ea0c395
commit 9575ca222b
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/PlayerbotAI.cpp
View File

@@ -202,15 +202,15 @@ void PlayerbotAI::UpdateAI(uint32 elapsed, bool minimal)
if (!bot->GetSession()) { if (!bot->GetSession()) {
return; return;
} }
if (bot->GetSession()->isLogingOut()) if (bot->GetSession()->isLogingOut())
{ {
if (bot->IsInCombat() || (master && master->IsInCombat() && sServerFacade->GetDistance2d(bot, master) < 30.0f)) // if (bot->IsInCombat() || (master && master->IsInCombat() && sServerFacade->GetDistance2d(bot, master) < 30.0f))
{ // {
WorldPackets::Character::LogoutCancel data = WorldPacket(CMSG_LOGOUT_CANCEL); // WorldPackets::Character::LogoutCancel data = WorldPacket(CMSG_LOGOUT_CANCEL);
bot->GetSession()->HandleLogoutCancelOpcode(data); // bot->GetSession()->HandleLogoutCancelOpcode(data);
TellMaster("Logout cancelled!"); // TellMaster("Logout cancelled!");
} // }
return;
} }
// if (bot->HasUnitMovementFlag(MOVEMENTFLAG_FALLING)) { // if (bot->HasUnitMovementFlag(MOVEMENTFLAG_FALLING)) {
// bot->Say("Falling!", LANG_UNIVERSAL); // bot->Say("Falling!", LANG_UNIVERSAL);

3
src/PlayerbotMgr.cpp
View File

@@ -231,6 +231,9 @@ void PlayerbotHolder::LogoutPlayerBot(ObjectGuid guid)
WorldSession* botWorldSessionPtr = bot->GetSession(); WorldSession* botWorldSessionPtr = bot->GetSession();
WorldSession* masterWorldSessionPtr = nullptr; WorldSession* masterWorldSessionPtr = nullptr;
if (botWorldSessionPtr->isLogingOut())
return;
Player* master = botAI->GetMaster(); Player* master = botAI->GetMaster();
if (master) if (master)
masterWorldSessionPtr = master->GetSession(); masterWorldSessionPtr = master->GetSession();