ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ground items: move repeated notify code into notifyHighlightedItem

Browse Source
This commit is contained in:
Hydrox6
2020-03-14 15:07:26 +00:00
committed by Tomas Slusny
parent 7595fad42c
commit 4a378817fd
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -242,12 +242,7 @@ public class GroundItemsPlugin extends Plugin
// The spawn time remains set at the oldest spawn // The spawn time remains set at the oldest spawn
} }
boolean shouldNotify = !config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted( if (!config.onlyShowLoot())
new NamedQuantity(groundItem),
groundItem.getGePrice(),
groundItem.getHaPrice()));
if (config.notifyHighlightedDrops() && shouldNotify)
{ {
notifyHighlightedItem(groundItem); notifyHighlightedItem(groundItem);
} }
@@ -370,12 +365,7 @@ public class GroundItemsPlugin extends Plugin
{ {
groundItem.setLootType(lootType); groundItem.setLootType(lootType);
boolean shouldNotify = config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted( if (config.onlyShowLoot())
new NamedQuantity(groundItem),
groundItem.getGePrice(),
groundItem.getHaPrice()));
if (config.notifyHighlightedDrops() && shouldNotify)
{ {
notifyHighlightedItem(groundItem); notifyHighlightedItem(groundItem);
} }
@@ -645,6 +635,16 @@ public class GroundItemsPlugin extends Plugin
private void notifyHighlightedItem(GroundItem item) private void notifyHighlightedItem(GroundItem item)
{ {
boolean shouldNotifyHighlighted = config.highlightedColor().equals(getHighlighted(
new NamedQuantity(item),
item.getGePrice(),
item.getHaPrice()));
if (!config.notifyHighlightedDrops() || !shouldNotifyHighlighted)
{
return;
}
final Player local = client.getLocalPlayer(); final Player local = client.getLocalPlayer();
final StringBuilder notificationStringBuilder = new StringBuilder() final StringBuilder notificationStringBuilder = new StringBuilder()
.append("[") .append("[")