From 927e02ff05582e97978a563a3c4fbe59a5af2910 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 25 Apr 2019 10:09:00 -0400 Subject: [PATCH 1/5] interface styles: invalidate healthbar cache on shutdown The padding needs to be reset for the normal healthbar --- .../client/plugins/interfacestyles/InterfaceStylesPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java index d39203863a..de15266d70 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java @@ -94,6 +94,8 @@ public class InterfaceStylesPlugin extends Plugin removeGameframe(); healthBarOverride = null; client.setHealthBarOverride(null); + NodeCache heathBarCache = client.getHealthBarCache(); + heathBarCache.reset(); // invalidate healthbar cache so padding resets }); } From 669b47d8989c37f75754458fe196b61e9018e4fe Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Thu, 25 Apr 2019 18:05:48 +0100 Subject: [PATCH 2/5] ammo: fix the infobox not getting removed --- .../net/runelite/client/plugins/ammo/AmmoPlugin.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java index 9e1d7dae33..ca1bd4a10a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java @@ -110,6 +110,7 @@ public class AmmoPlugin extends Plugin if (items.length <= EquipmentInventorySlot.AMMO.getSlotIdx()) { + removeInfobox(); return; } @@ -118,8 +119,7 @@ public class AmmoPlugin extends Plugin if (!comp.isStackable()) { - infoBoxManager.removeInfoBox(counterBox); - counterBox = null; + removeInfobox(); return; } @@ -134,9 +134,15 @@ public class AmmoPlugin extends Plugin return; } - infoBoxManager.removeInfoBox(counterBox); + removeInfobox(); final BufferedImage image = itemManager.getImage(item.getId(), 5, false); counterBox = new AmmoCounter(this, item.getId(), item.getQuantity(), comp.getName(), image); infoBoxManager.addInfoBox(counterBox); } + + private void removeInfobox() + { + infoBoxManager.removeInfoBox(counterBox); + counterBox = null; + } } From 23acff2118361f4c1e8904106d08f27ddf18d05e Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 25 Apr 2019 21:17:23 +0200 Subject: [PATCH 3/5] Fix Mutated Zygomite fungicide weaknes threshold Based on Wiki its 0-7 Signed-off-by: Tomas Slusny --- .../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 70acbcba06..69725f6d1b 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 @@ -129,7 +129,7 @@ enum Task MOLANISKS("Molanisks", ItemID.MOLANISK), MONKEYS("Monkeys", ItemID.ENSOULED_MONKEY_HEAD), MOSS_GIANTS("Moss giants", ItemID.HILL_GIANT_CLUB), - MUTATED_ZYGOMITES("Mutated zygomites", ItemID.MUTATED_ZYGOMITE, 0, ItemID.FUNGICIDE_SPRAY_0, "Zygomite", "Fungi"), + MUTATED_ZYGOMITES("Mutated zygomites", ItemID.MUTATED_ZYGOMITE, 7, ItemID.FUNGICIDE_SPRAY_0, "Zygomite", "Fungi"), NECHRYAEL("Nechryael", ItemID.NECHRYAEL, "Nechryarch"), OGRES("Ogres", ItemID.ENSOULED_OGRE_HEAD), OTHERWORLDLY_BEING("Otherworldly beings", ItemID.GHOSTLY_HOOD), From 678d868c03361a2f8699f171e2acf05e0a59b3d9 Mon Sep 17 00:00:00 2001 From: TheStonedTurtle Date: Thu, 25 Apr 2019 13:08:58 -0700 Subject: [PATCH 4/5] chat history: fix pm cycling deque max size --- .../plugins/chathistory/ChatHistoryPlugin.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 1cb5679498..8c5135b454 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -62,6 +62,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener private static final String CLEAR_HISTORY = "Clear history"; private static final String CLEAR_PRIVATE = "Private:"; private static final int CYCLE_HOTKEY = KeyEvent.VK_TAB; + private static final int FRIENDS_MAX_SIZE = 5; private Queue messageQueue; private Deque friends; @@ -91,7 +92,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener protected void startUp() { messageQueue = EvictingQueue.create(100); - friends = new ArrayDeque<>(5); + friends = new ArrayDeque<>(FRIENDS_MAX_SIZE + 1); keyManager.registerKeyListener(this); } @@ -134,7 +135,14 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener case MODPRIVATECHAT: final String name = Text.removeTags(chatMessage.getName()); // Remove to ensure uniqueness & its place in history - friends.remove(name); + if (!friends.remove(name)) + { + // If the friend didn't previously exist ensure deque capacity doesn't increase by adding them + if (friends.size() >= FRIENDS_MAX_SIZE) + { + friends.remove(); + } + } friends.add(name); // intentional fall-through case PUBLICCHAT: From efbf6ea9a4ad5bbe8466782d6a3a304ab31ff733 Mon Sep 17 00:00:00 2001 From: TheStonedTurtle Date: Thu, 25 Apr 2019 13:09:51 -0700 Subject: [PATCH 5/5] chat history: clear friend deque when clearing pm history --- .../runelite/client/plugins/chathistory/ChatHistoryPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 8c5135b454..03aa7c2110 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -176,6 +176,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener { messageQueue.removeIf(e -> e.getType() == ChatMessageType.PRIVATECHAT || e.getType() == ChatMessageType.PRIVATECHATOUT || e.getType() == ChatMessageType.MODPRIVATECHAT); + friends.clear(); } else {