From 17fa069b8d57864b76ddd8b45309e6b3ad40813a Mon Sep 17 00:00:00 2001 From: milestorme Date: Sat, 2 Mar 2019 11:32:46 +1100 Subject: [PATCH 1/2] Fix build error added missing constructor --- src/AuctionHouseBot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AuctionHouseBot.cpp b/src/AuctionHouseBot.cpp index d9fb142..3dec109 100644 --- a/src/AuctionHouseBot.cpp +++ b/src/AuctionHouseBot.cpp @@ -717,7 +717,7 @@ void AuctionHouseBot::Update() if ((!AHBSeller) && (!AHBBuyer)) return; - WorldSession _session(AHBplayerAccount, NULL, SEC_PLAYER, sWorld->getIntConfig(CONFIG_EXPANSION), 0, LOCALE_zhCN,0,false,false); + WorldSession _session(AHBplayerAccount, NULL, SEC_PLAYER, sWorld->getIntConfig(CONFIG_EXPANSION), 0, LOCALE_zhCN,0,false,false,0); Player _AHBplayer(&_session); _AHBplayer.Initialize(AHBplayerGUID); sObjectAccessor->AddObject(&_AHBplayer); From 2116123d865976b75a6812004fc392ba910c34f0 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Sat, 2 Mar 2019 14:29:39 +1100 Subject: [PATCH 2/2] eluna fix when manually applying patch with a broken .conf we can ignore this until conf is fixed, fixed build with ahbot and eluna we cant define 2 confs --- ahbot.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ahbot.patch b/ahbot.patch index e197d1d..d47e66c 100644 --- a/ahbot.patch +++ b/ahbot.patch @@ -174,7 +174,7 @@ index 01b1fe0acb..38b0e5fc90 100644 sAchievementMgr->LoadCompletedAchievements(); +#ifdef MOD_AH_BOT -+ std::string conf_path = _CONF_DIR; ++/* std::string conf_path = _CONF_DIR; + std::string cfg_file = conf_path + "/mod_ahbot.conf"; +#ifdef WIN32 + cfg_file = "mod_ahbot.conf"; @@ -182,7 +182,7 @@ index 01b1fe0acb..38b0e5fc90 100644 + std::string cfg_def_file = cfg_file + ".dist"; + sConfigMgr->LoadMore(cfg_def_file.c_str()); + sConfigMgr->LoadMore(cfg_file.c_str()); -+ ++*/ + // Initialize AHBot settings before deleting expired auctions due to AHBot hooks + auctionbot->InitializeConfiguration(); +#endif