From b7b40b300f7b364ec953ea068faa082fb043fa02 Mon Sep 17 00:00:00 2001 From: Unmoon Date: Sat, 3 Feb 2018 13:18:37 +0200 Subject: [PATCH 1/2] Show ground items under widgets and with interfaces open --- .../grounditems/GroundItemsOverlay.java | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 2613d1ff03..3e4ce364c4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -105,30 +105,6 @@ public class GroundItemsOverlay extends Overlay return null; } - Widget viewport = client.getViewportWidget(); - - if (viewport != null) - { - Widget[] subViewports = viewport.getStaticChildren(); - if (subViewports.length > 0) - { - for (Widget w : subViewports) - { - if (w.getNestedChildren().length > 0) - { - return null; - } - } - } - else - { - if (viewport.getNestedChildren().length > 0) - { - return null; - } - } - } - // gets the hidden/highlighted items from the text box in the config String configItems = config.getHiddenItems().toLowerCase(); List hiddenItems = Arrays.asList(configItems.split(DELIMITER_REGEX)); @@ -141,7 +117,7 @@ public class GroundItemsOverlay extends Overlay FontMetrics fm = graphics.getFontMetrics(); Player player = client.getLocalPlayer(); - if (player == null) + if (player == null || client.getViewportWidget() == null) { return null; } @@ -228,7 +204,7 @@ public class GroundItemsOverlay extends Overlay { Point point = itemLayer.getCanvasLocation(itemLayer.getHeight()); // if the item is offscreen, don't bother drawing it - if (point == null || (viewport != null && !viewport.contains(point))) + if (point == null) { continue; } From c4c812db2d003967e9b208ca1ef74c747af7c59b Mon Sep 17 00:00:00 2001 From: Unmoon Date: Sat, 3 Feb 2018 22:46:59 +0200 Subject: [PATCH 2/2] Remove unused import --- .../runelite/client/plugins/grounditems/GroundItemsOverlay.java | 1 - 1 file changed, 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 3e4ce364c4..40773e3a9f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -48,7 +48,6 @@ import net.runelite.api.Player; import net.runelite.api.Point; import net.runelite.api.Region; import net.runelite.api.Tile; -import net.runelite.api.widgets.Widget; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay;