From 75bc56874f2907ab5dc2b3e343870ffba480a4df Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Wed, 22 May 2019 23:00:27 +0100 Subject: [PATCH 1/3] Update FreezeTimersOverlay.java --- .../client/plugins/freezetimers/FreezeTimersOverlay.java | 1 - 1 file changed, 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index 1652556f9b..62e8aad5b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -95,7 +95,6 @@ public class FreezeTimersOverlay extends Overlay { final Player player = playerDespawned.getPlayer(); // All despawns ok: death, teleports, log out, runs away from screen - if (config.showPlayers() | config.showNpcs() | config.FreezeTimers() | config.Veng() | config.TB()) { this.remove(player); } From 7028ad47bd8d21d465a648df84f53c002f200c82 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Thu, 23 May 2019 00:01:57 +0100 Subject: [PATCH 2/3] Update FreezeTimersOverlay.java --- .../freezetimers/FreezeTimersOverlay.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index 62e8aad5b8..3f1905bf13 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.freezetimers; -import com.google.common.eventbus.Subscribe; import java.awt.Color; import static java.awt.Color.RED; import static java.awt.Color.WHITE; @@ -34,14 +33,10 @@ import java.awt.Font; import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; -import java.util.Map; -import java.util.HashMap; import javax.inject.Inject; import net.runelite.api.Actor; import net.runelite.api.Client; -import net.runelite.api.events.PlayerDespawned; import net.runelite.api.GraphicID; -import net.runelite.api.Player; import net.runelite.api.Point; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; @@ -53,7 +48,6 @@ import net.runelite.client.util.ImageUtil; public class FreezeTimersOverlay extends Overlay { - private final Map freezes = new HashMap<>(); private final FreezeTimersConfig config; private final Client client; private final Font timerFont = FontManager.getRunescapeBoldFont().deriveFont(14.0f); @@ -64,7 +58,7 @@ public class FreezeTimersOverlay extends Overlay private Timers timers; private boolean lock; private long finishedAtTest; - private Actor player; + @Inject public FreezeTimersOverlay(FreezeTimersConfig config, Client client) @@ -90,21 +84,6 @@ public class FreezeTimersOverlay extends Overlay return null; } - @Subscribe - public void onPlayerDespawned(PlayerDespawned playerDespawned) - { - final Player player = playerDespawned.getPlayer(); - // All despawns ok: death, teleports, log out, runs away from screen - { - this.remove(player); - } - - } - - public void remove(Actor actor) - { - freezes.remove(actor.getName()); - } private void renderOverlayFor(Graphics2D g, Actor actor) { if (timers.areAllTimersZero(actor)) From be0ec17e651d22120713c42cf12c2ad1dd171765 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Thu, 23 May 2019 00:03:09 +0100 Subject: [PATCH 3/3] Update FreezeTimersPlugin.java --- .../freezetimers/FreezeTimersPlugin.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index dc58487c50..ec1c9b72f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -26,15 +26,20 @@ package net.runelite.client.plugins.freezetimers; import com.google.inject.Provides; import javax.inject.Inject; +import net.runelite.api.Actor; import net.runelite.api.Client; +import net.runelite.api.Player; import net.runelite.api.events.GameTick; import net.runelite.api.events.GraphicChanged; +import net.runelite.api.events.PlayerDespawned; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; +import java.util.HashMap; +import java.util.Map; @PluginDescriptor( name = "Freeze Timers", @@ -44,6 +49,8 @@ import net.runelite.client.ui.overlay.OverlayManager; ) public class FreezeTimersPlugin extends Plugin { + private final Map freezes = new HashMap<>(); + private Actor player; @Inject private Client client; @@ -110,4 +117,16 @@ public class FreezeTimersPlugin extends Plugin prayerTracker.gameTick(); } + @Subscribe + public void onPlayerDespawned(PlayerDespawned playerDespawned) + { + final Player player = playerDespawned.getPlayer(); + // All despawns ok: death, teleports, log out, runs away from screen + this.remove(player); + } + public void remove(Actor actor) + { + freezes.remove(actor.getName()); + } + }