nchebrov/mod-ah-bot
1
0
Fork 0
mirror of https://github.com/NathanHandley/mod-ah-bot-plus.git synced 2026-02-07 21:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from zeb139/issue-29

Browse Source 
Manage AHBot Players with unique ptr
This commit is contained in:
Nathan Handley
2025-10-01 17:22:47 -05:00
committed by GitHub
parent 1abca1a971 a6ebda0116
commit 98639f3397
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/AuctionHouseBot.cpp
View File

@@ -1194,29 +1194,29 @@ void AuctionHouseBot::Update()
CyclesBetweenBuyOrSell = urand(CyclesBetweenBuyOrSellMin, CyclesBetweenBuyOrSellMax); CyclesBetweenBuyOrSell = urand(CyclesBetweenBuyOrSellMin, CyclesBetweenBuyOrSellMax);
// Load all AH Bot Players // Load all AH Bot Players
std::vector<std::pair<Player*, std::unique_ptr<WorldSession>>> AHBPlayers; std::vector<std::pair<std::unique_ptr<Player>, std::unique_ptr<WorldSession>>> AHBPlayers;
AHBPlayers.reserve(AHCharacters.size()); AHBPlayers.reserve(AHCharacters.size());
for (uint32 botIndex = 0; botIndex < AHCharacters.size(); ++botIndex) for (uint32 botIndex = 0; botIndex < AHCharacters.size(); ++botIndex)
{ {
CurrentBotCharGUID = AHCharacters[botIndex].CharacterGUID; CurrentBotCharGUID = AHCharacters[botIndex].CharacterGUID;
std::string accountName = "AuctionHouseBot" + std::to_string(AHCharacters[botIndex].AccountID); std::string accountName = "AuctionHouseBot" + std::to_string(AHCharacters[botIndex].AccountID);
// Wrap session in unique pointer to manage the session lifetime // Wrap session and player in unique pointer to manage lifetime
auto session = std::make_unique<WorldSession>( auto session = std::make_unique<WorldSession>(
AHCharacters[botIndex].AccountID, std::move(accountName), 0, nullptr, AHCharacters[botIndex].AccountID, std::move(accountName), 0, nullptr,
SEC_PLAYER, sWorld->getIntConfig(CONFIG_EXPANSION), 0, LOCALE_enUS, 0, false, false, 0 SEC_PLAYER, sWorld->getIntConfig(CONFIG_EXPANSION), 0, LOCALE_enUS, 0, false, false, 0
); );
Player* player = new Player(session.get()); auto player = std::make_unique<Player>(session.get());
player->Initialize(AHCharacters[botIndex].CharacterGUID); player->Initialize(AHCharacters[botIndex].CharacterGUID);
ObjectAccessor::AddObject(player); ObjectAccessor::AddObject(player.get());
AHBPlayers.emplace_back(player, std::move(session)); AHBPlayers.emplace_back(std::move(player), std::move(session));
} }
// Create a vector of Player* for passing to methods // Create a vector of Player* for passing to methods
std::vector<Player*> playersPointerVector; std::vector<Player*> playersPointerVector;
playersPointerVector.reserve(AHBPlayers.size()); playersPointerVector.reserve(AHBPlayers.size());
for (const auto& pair : AHBPlayers) for (const auto& pair : AHBPlayers)
playersPointerVector.push_back(pair.first); playersPointerVector.emplace_back(pair.first.get());
// Add New Bids // Add New Bids
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION) == false) if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION) == false)
@@ -1233,12 +1233,9 @@ void AuctionHouseBot::Update()
if (BuyingBotBuyCandidatesPerBuyCycleMin > 0) if (BuyingBotBuyCandidatesPerBuyCycleMin > 0)
AddNewAuctionBuyerBotBid(playersPointerVector, &NeutralConfig); AddNewAuctionBuyerBotBid(playersPointerVector, &NeutralConfig);
// Explicitly delete players to close sessions // Remove AH Bot Players from world
for (auto& [player, session] : AHBPlayers) for (auto& [player, session] : AHBPlayers)
{ ObjectAccessor::RemoveObject(player.get());
ObjectAccessor::RemoveObject(player);
delete player;
}
} }
void AuctionHouseBot::InitializeConfiguration() void AuctionHouseBot::InitializeConfiguration()