Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
Showing only changes of commit dc0a0b1cff - Show all commits

View file

@ -131,15 +131,11 @@ class GrandExchange : StartupListener, Commands {
@JvmStatic
fun getRecommendedPrice(itemID: Int, from_bot: Boolean = false): Int {
var base = max(PriceIndex.getValue(itemID), getItemDefPrice(itemID))
var base = PriceIndex.getValue(itemID)
if (from_bot) base = (max(BotPrices.getPrice(itemID), base) * 1.10).toInt()
return base
}
private fun getItemDefPrice(itemID: Int): Int {
return max(itemDefinition(itemID).getConfiguration(ItemConfigParser.GE_PRICE) ?: 0, itemDefinition(itemID).value)
}
@JvmStatic
fun getOfferStats(itemID: Int, sale: Boolean) : String
{