From 147a844c7a6fe88c3f1a07aed48fdba499a20754 Mon Sep 17 00:00:00 2001 From: BarbzYHOOL Date: Thu, 30 Jan 2020 23:49:28 +0100 Subject: [PATCH] fix: ah_bot.patch --- .../game/AuctionHouse/AuctionHouseMgr.cpp | 23 ++++++++++++++++++- src/server/game/Mails/Mail.cpp | 12 ++++++++++ src/server/game/World/World.cpp | 12 ++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index b8363279..05318818 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -21,6 +21,9 @@ #include #include "AvgDiffTracker.h" #include "AsyncAuctionListing.h" +#ifdef MOD_AH_BOT +#include "AuctionHouseBot.h" +#endif enum eAuctionHouse { @@ -145,8 +148,11 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry* auction, SQLTransa if (owner || owner_accId) { uint32 profit = auction->bid + auction->deposit - auction->GetAuctionCut(); - +#ifdef MOD_AH_BOT + if (owner && owner->GetGUIDLow() != auctionbot->GetAHBplayerGUID()) +#else if (owner) +#endif { owner->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_EARNED_BY_AUCTIONS, profit); owner->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_SOLD, auction->bid); @@ -189,7 +195,11 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry* auction, SQLTransacti // owner exist if (owner || owner_accId) { +#ifdef MOD_AH_BOT + if (owner && owner->GetGUIDLow() != auctionbot->GetAHBplayerGUID()) +#else if (owner) +#endif owner->GetSession()->SendAuctionOwnerNotification(auction); MailDraft(auction->BuildAuctionMailSubject(AUCTION_EXPIRED), AuctionEntry::BuildAuctionMailBody(0, 0, auction->buyout, auction->deposit, 0)) @@ -213,6 +223,11 @@ void AuctionHouseMgr::SendAuctionOutbiddedMail(AuctionEntry* auction, uint32 new // old bidder exist if (oldBidder || oldBidder_accId) { +#ifdef MOD_AH_BOT + if (oldBidder && !newBidder) + oldBidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, auctionbot->GetAHBplayerGUID(), newPrice, auction->GetAuctionOutBid(), auction->item_template); +#endif // MOD_AH_BOT + if (oldBidder && newBidder) oldBidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, newBidder->GetGUID(), newPrice, auction->GetAuctionOutBid(), auction->item_template); @@ -413,10 +428,16 @@ void AuctionHouseObject::AddAuction(AuctionEntry* auction) AuctionsMap[auction->Id] = auction; sScriptMgr->OnAuctionAdd(this, auction); +#ifdef MOD_AH_BOT + auctionbot->IncrementItemCounts(auction); +#endif } bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction) { +#ifdef MOD_AH_BOT + auctionbot->DecrementItemCounts(auction, auction->item_template); +#endif bool wasInMap = AuctionsMap.erase(auction->Id) ? true : false; sScriptMgr->OnAuctionRemove(this, auction); diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 6683fe2f..9fcd2094 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -15,6 +15,9 @@ #include "Item.h" #include "AuctionHouseMgr.h" #include "CalendarMgr.h" +#ifdef MOD_AH_BOT +#include "AuctionHouseBot.h" +#endif MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery) { @@ -175,6 +178,15 @@ void MailDraft::SendMailTo(SQLTransaction& trans, MailReceiver const& receiver, uint32 mailId = sObjectMgr->GenerateMailID(); +#ifdef MOD_AH_BOT + if (receiver.GetPlayerGUIDLow() == auctionbot->GetAHBplayerGUID()) + { + if (sender.GetMailMessageType() == MAIL_AUCTION) // auction mail with items + deleteIncludedItems(trans, true); + return; + } +#endif + time_t deliver_time = time(NULL) + deliver_delay; //expire time if COD 3 days, if no COD 30 days, if auction sale pending 1 hour diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 53ce3fc1..3b39a994 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -83,6 +83,10 @@ #include "LuaEngine.h" #endif +#ifdef MOD_AH_BOT +#include "AuctionHouseBot.h" +#endif + ACE_Atomic_Op World::m_stopEvent = false; uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE; uint32 World::m_worldLoopCounter = 0; @@ -1739,6 +1743,11 @@ void World::SetInitialWorldSettings() sLog->outString("Loading Completed Achievements..."); sAchievementMgr->LoadCompletedAchievements(); +#ifdef MOD_AH_BOT + // Initialize AHBot settings before deleting expired auctions due to AHBot hooks + auctionbot->InitializeConfiguration(); +#endif + ///- Load dynamic data tables from the database sLog->outString("Loading Item Auctions..."); sAuctionMgr->LoadAuctionItems(); @@ -2165,6 +2174,9 @@ void World::Update(uint32 diff) // pussywizard: handle auctions when the timer has passed if (m_timers[WUPDATE_AUCTIONS].Passed()) { +#ifdef MOD_AH_BOT + auctionbot->Update(); +#endif m_timers[WUPDATE_AUCTIONS].Reset(); // pussywizard: handle expired auctions, auctions expired when realm was offline are also handled here (not during loading when many required things aren't loaded yet) -- 2.17.0