Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +6 -4
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d99e6b2541 - Show all commits

10
Server/src/main/content/global/skill/crafting/BattlestaffListener.kt
View file

@ -17,6 +17,10 @@ class BattlestaffListener : InteractionListener {
onUseWith(IntType.ITEM, orbs, battlestaff) { player, used, with ->
val product = BattlestaffProduct.productMap[used.id] ?: return@onUseWith true
fun getMaxAmount(_unused: Int = 0): Int {
return min(amountInInventory(player, with.id), amountInInventory(player, used.id))
}
if (!hasLevelDyn(player, Skills.CRAFTING, product.minimumLevel)) {
sendMessage(player, "You need a Crafting level of ${product.minimumLevel} to make this.")
return@onUseWith true
@ -41,7 +45,7 @@ class BattlestaffListener : InteractionListener {
withItems(product.producedItemId)
create { _, amount ->
runTask(player, 2, amount) {
runTask(player, 2, min(amount, getMaxAmount())) {
if (amount < 1) return@runTask
if (removeItem(player, product.requiredOrbItemId) && removeItem(player, Items.BATTLESTAFF_1391)) {
@ -55,9 +59,7 @@ class BattlestaffListener : InteractionListener {
}
}
calculateMaxAmount { _ ->
min(amountInInventory(player, with.id), amountInInventory(player, used.id))
}
calculateMaxAmount(::getMaxAmount)
}
return@onUseWith true