From 418f239261605d9171896eccbd7bc7281249465f Mon Sep 17 00:00:00 2001 From: Ceikry Date: Fri, 11 Aug 2023 13:09:35 +0000 Subject: [PATCH] Fixed item dupe in GE --- .../global/handlers/iface/ge/StockMarket.kt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Server/src/main/content/global/handlers/iface/ge/StockMarket.kt b/Server/src/main/content/global/handlers/iface/ge/StockMarket.kt index 52f1de8dc..1782881d3 100644 --- a/Server/src/main/content/global/handlers/iface/ge/StockMarket.kt +++ b/Server/src/main/content/global/handlers/iface/ge/StockMarket.kt @@ -242,17 +242,11 @@ class StockMarket : InterfaceListener { return } var item: Item - val amountLeft: Int = offer.amount - amountInInventory(player, offer.itemID) - val remove = removeItem(player, Item(offer.itemID, offer.amount).also { item = it }) - var note: Int - if (amountLeft > 0) { - if (item.noteChange.also { note = it } > 0) { - removeItem(player, Item(note, amountLeft)) - } else if (remove) { - addItem(player, offer.itemID, offer.amount - amountLeft) - return - } - } + val amountUnnoted = amountInInventory(player, offer.itemID) + val amountLeft = offer.amount - amountUnnoted + val removedUnnoted = removeItem(player, Item(offer.itemID, amountUnnoted).also { item = it }) + val removeNoted = if (amountLeft > 0) removeItem(player, Item(itemDefinition(offer.itemID).noteId, amountLeft)) else true + if (!removedUnnoted || !removeNoted) return if(GrandExchange.dispatch(player, offer)) { player.removeAttribute("ge-temp")