From e4787b595a6b3e365cebcdc085a71bd8030e18e5 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Fri, 31 May 2019 17:25:52 +0200 Subject: [PATCH] Make examineplugin stop running getItemComposition on executor thread (#461) --- .../java/net/runelite/client/game/ItemManager.java | 14 ++++++++++++++ .../client/plugins/examine/ExaminePlugin.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 0a7844f6a2..61aff5254e 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -412,6 +412,20 @@ public class ItemManager return price; } + public int getAlchValue(ItemComposition composition) + { + if (composition.getId() == ItemID.COINS_995) + { + return 1; + } + if (composition.getId() == ItemID.PLATINUM_TOKEN) + { + return 1000; + } + + return (int) Math.max(1, composition.getPrice() * HIGH_ALCHEMY_CONSTANT); + } + public int getAlchValue(int itemID) { if (itemID == ItemID.COINS_995) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index 7a11d73140..a6fc131094 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -322,7 +322,7 @@ public class ExaminePlugin extends Plugin quantity = Math.max(1, quantity); int itemCompositionPrice = itemComposition.getPrice(); final int gePrice = itemManager.getItemPrice(id); - final int alchPrice = itemCompositionPrice <= 0 ? 0 : itemManager.getAlchValue(id); + final int alchPrice = itemCompositionPrice <= 0 ? 0 : itemManager.getAlchValue(itemComposition); if (gePrice > 0 || alchPrice > 0) {