Skip to content

Commit 035c21e

Browse files
committed
Add compatibility with AH threading PR request
1 parent eea2e77 commit 035c21e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/AuctionHouseBot.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ void AuctionHouseBot::Sell(Player* AHBplayer, AHBConfig* config)
551551
// Retrieve the auction house situation
552552
//
553553

554-
AuctionHouseEntry const* ahEntry = sAuctionMgr->GetAuctionHouseEntry(config->GetAHFID());
554+
AuctionHouseEntry const* ahEntry = sAuctionMgr->GetAuctionHouseEntryFromFactionTemplate(config->GetAHFID());
555555

556556
if (!ahEntry)
557557
{
@@ -915,7 +915,7 @@ void AuctionHouseBot::Sell(Player* AHBplayer, AHBConfig* config)
915915

916916
AuctionEntry* auctionEntry = new AuctionEntry();
917917
auctionEntry->Id = sObjectMgr->GenerateAuctionID();
918-
auctionEntry->houseId = config->GetAHID();
918+
auctionEntry->houseId = AuctionHouseId(config->GetAHID());
919919
auctionEntry->item_guid = item->GetGUID();
920920
auctionEntry->item_template = item->GetEntry();
921921
auctionEntry->itemCount = item->GetCount();

src/AuctionHouseBotAuctionHouseScript.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void AHBot_AuctionHouseScript::OnBeforeAuctionHouseMgrSendAuctionOutbiddedMail(
6868
std::advance(it, randBot);
6969

7070
oldBidder->GetSession()->SendAuctionBidderNotification(
71-
auction->GetHouseId(),
71+
(uint32)auction->GetHouseId(),
7272
auction->Id,
7373
ObjectGuid::Create<HighGuid::Player>(*it),
7474
newPrice,
@@ -84,16 +84,16 @@ void AHBot_AuctionHouseScript::OnAuctionAdd(AuctionHouseObject* /*ah*/, AuctionE
8484
// The the configuration for the auction house
8585
//
8686

87-
AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auction->GetHouseId());
87+
AuctionHouseEntry const* ahEntry = sAuctionMgr->GetAuctionHouseEntryFromHouse(auction->GetHouseId());
8888
AHBConfig* config = gNeutralConfig;
8989

9090
if (ahEntry)
9191
{
92-
if (ahEntry->houseId == AUCTIONHOUSE_ALLIANCE)
92+
if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Alliance)
9393
{
9494
config = gAllianceConfig;
9595
}
96-
else if (ahEntry->houseId == AUCTIONHOUSE_HORDE)
96+
else if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Horde)
9797
{
9898
config = gHordeConfig;
9999
}
@@ -147,16 +147,16 @@ void AHBot_AuctionHouseScript::OnAuctionRemove(AuctionHouseObject* /*ah*/, Aucti
147147
// Get the configuration for the auction house
148148
//
149149

150-
AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auction->GetHouseId());
150+
AuctionHouseEntry const* ahEntry = sAuctionMgr->GetAuctionHouseEntryFromHouse(auction->GetHouseId());
151151
AHBConfig* config = gNeutralConfig;
152152

153153
if (ahEntry)
154154
{
155-
if (ahEntry->houseId == AUCTIONHOUSE_ALLIANCE)
155+
if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Alliance)
156156
{
157157
config = gAllianceConfig;
158158
}
159-
else if (ahEntry->houseId == AUCTIONHOUSE_HORDE)
159+
else if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Horde)
160160
{
161161
config = gHordeConfig;
162162
}
@@ -210,16 +210,16 @@ void AHBot_AuctionHouseScript::OnAuctionSuccessful(AuctionHouseObject* /*ah*/, A
210210
// Get the configuration for the auction house
211211
//
212212

213-
AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auction->GetHouseId());
213+
AuctionHouseEntry const* ahEntry = sAuctionMgr->GetAuctionHouseEntryFromHouse(auction->GetHouseId());
214214
AHBConfig* config = gNeutralConfig;
215215

216216
if (ahEntry)
217217
{
218-
if (ahEntry->houseId == AUCTIONHOUSE_ALLIANCE)
218+
if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Alliance)
219219
{
220220
config = gAllianceConfig;
221221
}
222-
else if (ahEntry->houseId == AUCTIONHOUSE_HORDE)
222+
else if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Horde)
223223
{
224224
config = gHordeConfig;
225225
}
@@ -239,16 +239,16 @@ void AHBot_AuctionHouseScript::OnAuctionExpire(AuctionHouseObject* /*ah*/, Aucti
239239
// Get the configuration for the auction house
240240
//
241241

242-
AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auction->GetHouseId());
242+
AuctionHouseEntry const* ahEntry = sAuctionMgr->GetAuctionHouseEntryFromHouse(auction->GetHouseId());
243243
AHBConfig* config = gNeutralConfig;
244244

245245
if (ahEntry)
246246
{
247-
if (ahEntry->houseId == AUCTIONHOUSE_ALLIANCE)
247+
if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Alliance)
248248
{
249249
config = gAllianceConfig;
250250
}
251-
else if (ahEntry->houseId == AUCTIONHOUSE_HORDE)
251+
else if (AuctionHouseId(ahEntry->houseId) == AuctionHouseId::Horde)
252252
{
253253
config = gHordeConfig;
254254
}

0 commit comments

Comments
 (0)