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 initself crash

Browse Source
This commit is contained in:
Yunfan Li
2024-09-05 15:57:32 +08:00
parent 369f3373ed
commit 73f699fe89
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/PlayerbotAI.cpp
View File

@@ -5257,6 +5257,7 @@ bool PlayerbotAI::EqualLowercaseName(std::string s1, std::string s2)
return true; return true;
} }
// A custom CanEquipItem (remove AutoUnequipOffhand in FindEquipSlot to prevent unequip on `item usage` calculation)
InventoryResult PlayerbotAI::CanEquipItem(uint8 slot, uint16& dest, Item* pItem, bool swap, bool not_loading) const InventoryResult PlayerbotAI::CanEquipItem(uint8 slot, uint16& dest, Item* pItem, bool swap, bool not_loading) const
{ {
dest = 0; dest = 0;

11
src/factory/PlayerbotFactory.cpp
View File

@@ -2060,7 +2060,8 @@ bool PlayerbotFactory::CanEquipUnseenItem(uint8 slot, uint16& dest, uint32 item)
if (Item* pItem = Item::CreateItem(item, 1, bot, false, 0, true)) if (Item* pItem = Item::CreateItem(item, 1, bot, false, 0, true))
{ {
InventoryResult result = botAI->CanEquipItem(slot, dest, pItem, true, true); InventoryResult result = botAI ? botAI->CanEquipItem(slot, dest, pItem, true, true)
: bot->CanEquipItem(slot, dest, pItem, true, true);
pItem->RemoveFromUpdateQueueOf(bot); pItem->RemoveFromUpdateQueueOf(bot);
delete pItem; delete pItem;
return result == EQUIP_ERR_OK; return result == EQUIP_ERR_OK;
@@ -2382,10 +2383,10 @@ void PlayerbotFactory::InitAvailableSpells()
{ {
bot->learnSpell(tSpell->learnedSpell[0], false); bot->learnSpell(tSpell->learnedSpell[0], false);
} }
else // else
{ // {
botAI->CastSpell(tSpell->spell, bot); // botAI->CastSpell(tSpell->spell, bot);
} // }
} }
// LOG_INFO("playerbots", "C: {}, ok: {}", ++learnedCounter, oktest); // LOG_INFO("playerbots", "C: {}, ok: {}", ++learnedCounter, oktest);
// if (++learnedCounter > 20) // if (++learnedCounter > 20)