diff --git a/Server/src/main/core/cache/def/impl/ItemDefinition.java b/Server/src/main/core/cache/def/impl/ItemDefinition.java index 717511646..1c1d72e57 100644 --- a/Server/src/main/core/cache/def/impl/ItemDefinition.java +++ b/Server/src/main/core/cache/def/impl/ItemDefinition.java @@ -187,7 +187,7 @@ public class ItemDefinition extends Definition { private int colourEquip2; /** - * The note item. + * The note item id if un-noted. The un-noted item id if noted. -1 if no noted counterpart. */ private int noteId = -1; diff --git a/Server/src/main/core/game/ge/GrandExchange.kt b/Server/src/main/core/game/ge/GrandExchange.kt index 9e1d9dafe..fc7c5b12f 100644 --- a/Server/src/main/core/game/ge/GrandExchange.kt +++ b/Server/src/main/core/game/ge/GrandExchange.kt @@ -1,17 +1,18 @@ package core.game.ge +import core.ServerConstants import core.api.* +import core.cache.def.impl.ItemDefinition import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails import core.game.node.entity.player.link.audio.Audio -import core.game.system.task.Pulse -import core.ServerConstants -import core.tools.SystemLogger import core.game.system.command.Privilege import core.game.system.config.ItemConfigParser +import core.game.system.task.Pulse import core.game.world.GameWorld import core.game.world.repository.Repository import core.tools.Log +import core.tools.SystemLogger import core.tools.colorize import java.lang.Integer.max import java.util.concurrent.LinkedBlockingDeque @@ -203,7 +204,9 @@ class GrandExchange : StartupListener, Commands { if (!PriceIndex.canTrade(itemID)) return false - val offer = GrandExchangeOffer.createBotOffer(itemID, amount) + // noted offers can not be bought. + val itemDef = ItemDefinition.forId(itemID) + val offer = GrandExchangeOffer.createBotOffer(if (itemDef.isUnnoted) itemID else itemDef.noteId, amount) pendingOffers.addLast(offer) return true