From 3891c73b5b968561aad4c12fb7dff54791740449 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:24:17 +0200 Subject: [PATCH] combatcounter: Someones keyboard fucking broke --- .../plugins/combatcounter/CombatCounter.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 47f6e2c19e..9270dd0e4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -290,7 +290,9 @@ public class CombatCounter extends Plugin ticks = 3; } if (counter.containsKey(name)) + { ticks += counter.get(name); + } counter.put(name, ticks); counter = sortByValue(counter); @@ -379,13 +381,17 @@ public class CombatCounter extends Plugin { NPCDamageCounter dc = new NPCDamageCounter(); if (this.npcDamageMap.containsKey(target)) + { dc = this.npcDamageMap.get(target); + } for (Integer tick : ticksToAdd) { List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) + { attackers = dc.attackers.get(tick); + } attackers.add(name); dc.attackers.put(tick, attackers); @@ -425,7 +431,9 @@ public class CombatCounter extends Plugin for (Player p : this.client.getPlayers()) { if (p.getName() != null) + { visible.put(p.getName(), p); + } } for (NPC npc : new ArrayList<>(this.npcDamageMap.keySet())) @@ -442,7 +450,9 @@ public class CombatCounter extends Plugin double totalDamage = 0d; for (Integer damage : counter.damage) + { totalDamage += damage; + } if (attackers.containsKey(-1)) { @@ -454,7 +464,9 @@ public class CombatCounter extends Plugin { double count = 0d; if (this.playerDamage.containsKey(name)) + { count = this.playerDamage.get(name); + } count += damagePerPlayer; this.playerDamage.put(name, count); @@ -475,11 +487,17 @@ public class CombatCounter extends Plugin // } for (Integer i : new ArrayList<>(attackers.keySet())) + { if (i <= -1) + { attackers.remove(i); + } + } if (attackers.isEmpty()) + { this.npcDamageMap.remove(npc); + } } this.playerDamage = sortByValue(this.playerDamage); @@ -508,20 +526,26 @@ public class CombatCounter extends Plugin NPCDamageCounter dc = new NPCDamageCounter(); if (this.npcDamageMap.containsKey(npc)) + { dc = this.npcDamageMap.get(npc); + } int delay = this.calculateBPDelay(distance); List counts = new ArrayList<>(); counts.add(delay); if (delay > 2) + { counts.add(delay - 1); + } for (int tick : counts) { List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) + { attackers = dc.attackers.get(tick); + } attackers.add(user); dc.attackers.put(tick, attackers); @@ -545,12 +569,16 @@ public class CombatCounter extends Plugin Actor actor = event.getActor(); if (!(actor instanceof NPC)) + { return; + } NPC npc = (NPC) actor; if (!this.npcDamageMap.containsKey(npc)) + { return; + } Hitsplat splat = event.getHitsplat(); NPCDamageCounter dc = this.npcDamageMap.get(npc); @@ -586,6 +614,7 @@ public class CombatCounter extends Plugin int distance = wpNPC.distanceTo(wpPlayer); if (size > 1) + { for (int x = 0; x < size; x++) { for (int y = 0; y < size; y++) @@ -598,6 +627,8 @@ public class CombatCounter extends Plugin } } } + } + return distance; }