From 307e646cb2afacdc87fd95994ffe3b4e4aa935d8 Mon Sep 17 00:00:00 2001
From: Sebastiaan <34197030+ItsSebas@users.noreply.github.com>
Date: Fri, 24 Aug 2018 15:24:41 +0200
Subject: [PATCH] Make teleblock timers disappear on logout/hop (#5090)

Based on latest OSRS change, teleblock timers are now removed on succesful world hop and logout.
---
 .../client/plugins/timers/TimersPlugin.java       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
index 539e6a3219..d6eeb65568 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
@@ -33,6 +33,7 @@ import net.runelite.api.AnimationID;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
+import net.runelite.api.GameState;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
@@ -48,6 +49,7 @@ import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
+import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GraphicChanged;
 import net.runelite.api.events.ItemContainerChanged;
 import net.runelite.api.events.MenuOptionClicked;
@@ -501,6 +503,19 @@ public class TimersPlugin extends Plugin
 		}
 	}
 
+	@Subscribe
+	public void onGameStateChanged(GameStateChanged gameStateChanged)
+	{
+		// Check for game state changes which removes a teleblock (Hopping or Login screen)
+		if (gameStateChanged.getGameState() == GameState.HOPPING || gameStateChanged.getGameState() == GameState.LOGIN_SCREEN)
+		{
+			removeGameTimer(HALFTB);
+			removeGameTimer(DMM_HALFTB);
+			removeGameTimer(FULLTB);
+			removeGameTimer(DMM_FULLTB);
+		}
+	}
+
 	@Subscribe
 	public void onAnimationChanged(AnimationChanged event)
 	{