From 64d9a260a0da3eec41b83af4028664b0fb200260 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:19:53 +0200 Subject: [PATCH] combatcounter: Don't access map more than needed --- .../client/plugins/combatcounter/CombatOverlay.java | 9 +++++---- .../client/plugins/combatcounter/DamageOverlay.java | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java index dd0a2cc25c..de414bc3b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java @@ -96,17 +96,18 @@ class CombatOverlay extends Overlay return null; } - for (String name : map.keySet()) + for (Map.Entry counter : map.entrySet()) { + String name = counter.getKey(); if (client.getLocalPlayer().getName().contains(name)) { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getSelfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getOtherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getOtherColor())); } - total += map.get(name); + total += counter.getValue(); } if (!map.containsKey(local.getName())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java index 0e2cd5109e..8a27e6f96b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java @@ -97,16 +97,16 @@ class DamageOverlay extends Overlay return null; } - for (String name : map.keySet()) + for (Map.Entry damage : map.entrySet()) { - String val = String.format("%.1f", map.get(name)); - if (client.getLocalPlayer().getName().contains(name)) + String val = String.format("%.1f", damage.getValue()); + if (client.getLocalPlayer().getName().contains(damage.getKey())) { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor())); } }