Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
This commit is contained in:
Carbenium committed 2015-07-21 18:30:05 +02:00
2 parents 9f1d71a53f 799bdc1710
commit 68fd138476
10 files changed
+73 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
+3 -3
View File
@@ -207,12 +207,12 @@ bool AuctionBotSeller::Initialize()
{
if (sAuctionBotConfig->GetConfig(CONFIG_AHBOT_BUYPRICE_SELLER))
{
if (prototype->BuyPrice == 0)
if (prototype->SellPrice == 0)
continue;
}
else
{
if (prototype->SellPrice == 0)
if (prototype->BuyPrice == 0)
continue;
}
}
@@ -706,7 +706,7 @@ void AuctionBotSeller::SetPricesOfItem(ItemTemplate const* itemProto, SellerConf
if (sellPrice == 0)
sellPrice = (buyPrice > 10 ? buyPrice / GetSellModifier(itemProto) : buyPrice);
if (!sAuctionBotConfig->GetConfig(CONFIG_AHBOT_BUYPRICE_SELLER))
if (sAuctionBotConfig->GetConfig(CONFIG_AHBOT_BUYPRICE_SELLER))
buyPrice = sellPrice;
uint32 basePrice = (buyPrice * stackCount * priceRatio) / (itemProto->Class == 6 ? 200 : itemProto->BuyCount) / 100;