From c7ce2d82fa8b9dadd6944f41c90d4f59c75439b0 Mon Sep 17 00:00:00 2001 From: Minh Pham <32379779+Minhs2@users.noreply.github.com> Date: Mon, 7 Feb 2022 21:27:49 -0600 Subject: [PATCH 1/2] slayer: add penguins to bird task --- .../src/main/java/net/runelite/client/plugins/slayer/Task.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java index 37b517c4ec..798a79da6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java @@ -57,7 +57,7 @@ enum Task BASILISKS("Basilisks", ItemID.BASILISK), BATS("Bats", ItemID.GIRAL_BAT_2, "Death wing"), BEARS("Bears", ItemID.ENSOULED_BEAR_HEAD), - BIRDS("Birds", ItemID.FEATHER, "Chicken", "Rooster", "Terrorbird", "Seagull", "Vulture", "Duck"), + BIRDS("Birds", ItemID.FEATHER, "Chicken", "Rooster", "Terrorbird", "Seagull", "Vulture", "Duck", "Penguin"), BLACK_DEMONS("Black demons", ItemID.BLACK_DEMON_MASK), BLACK_DRAGONS("Black dragons", ItemID.BLACK_DRAGON_MASK, "Baby black dragon"), BLACK_KNIGHTS("Black Knights", ItemID.BLACK_FULL_HELM, "Black Knight"), From 2d52f6d1b4a0271c27ab8a52b029e7cf732c8341 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 7 Feb 2022 23:03:09 -0500 Subject: [PATCH 2/2] overlay manager: prevent loading dynamic overlay positions The overlay renderer tries to never set these, but they can still be set due to conflicting overlay names or from old configs. --- .../client/ui/overlay/OverlayManager.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index 31d428ceed..ab333a8bcf 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -40,6 +40,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.config.ConfigGroup; @@ -53,6 +54,7 @@ import net.runelite.client.events.PluginChanged; * Manages state of all game overlays */ @Singleton +@Slf4j public class OverlayManager { public static final String OPTION_CONFIGURE = "Configure"; @@ -317,7 +319,18 @@ public class OverlayManager final Dimension size = loadOverlaySize(overlay); overlay.setPreferredSize(size); final OverlayPosition position = loadOverlayPosition(overlay); - overlay.setPreferredPosition(position); + if (position != null) + { + if (overlay.getPosition() != OverlayPosition.DYNAMIC && overlay.getPosition() != OverlayPosition.TOOLTIP) + { + overlay.setPreferredPosition(position); + } + else + { + log.info("Resetting preferred position of dynamic overlay {}", overlay.getClass().getSimpleName()); + saveOverlayPosition(overlay); + } + } } private void updateOverlayConfig(final Overlay overlay)