From b75a4f1fa741402ca44f33e5485ddb2e0e4a2131 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.lohaus@hotmail.com>
Date: Tue, 16 Jul 2019 18:22:39 +0200
Subject: [PATCH] VorkathHelper fix and FreezeTimers fix related to Vorkath
 (#1011)

* vorkathhelper: fix attacks left not updating correctly

* freezetimers: fix timer after killing vorkath spawn, remove redundant class

* freezetimers: remove redundant imports
---
 .../plugins/freezetimers/FreezeInfo.java      | 16 ---------
 .../freezetimers/FreezeTimersPlugin.java      | 36 ++++++++++++-------
 .../client/plugins/vorkath/VorkathPlugin.java |  6 +---
 3 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
deleted file mode 100644
index 2a5409cd4d..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.runelite.client.plugins.freezetimers;
-
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import net.runelite.api.Actor;
-import net.runelite.api.coords.LocalPoint;
-
-@Builder
-class FreezeInfo
-{
-	@Getter(AccessLevel.PACKAGE)
-	private final Actor actor;
-	@Getter(AccessLevel.PACKAGE)
-	private final LocalPoint freezePoint;
-}
\ No newline at end of file
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 3a19f7be49..c297ec1f63 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
@@ -25,25 +25,24 @@
 package net.runelite.client.plugins.freezetimers;
 
 import com.google.inject.Provides;
-import java.util.HashMap;
-import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
-import net.runelite.api.Player;
+import net.runelite.api.NPC;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
+import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.SpotAnimationChanged;
-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 org.apache.commons.lang3.ArrayUtils;
 
 @PluginDescriptor(
 	name = "Freeze Timers",
@@ -55,7 +54,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 @Singleton
 public class FreezeTimersPlugin extends Plugin
 {
-	private final Map<String, FreezeInfo> freezes = new HashMap<>();
+	private static final int VORKATH_REGION = 9023;
 
 	@Inject
 	private Client client;
@@ -155,19 +154,32 @@ public class FreezeTimersPlugin extends Plugin
 	}
 
 	@Subscribe
-	public void onPlayerDespawned(PlayerDespawned playerDespawned)
+	public void onNpcDespawned(NpcDespawned event)
 	{
-		final Player player = playerDespawned.getPlayer();
-		// All despawns ok: death, teleports, log out, runs away from screen
-		this.remove(player);
+		if (!isAtVorkath())
+		{
+			return;
+		}
+
+		final NPC npc = event.getNpc();
+
+		if (npc.getName() == null)
+		{
+			return;
+		}
+
+		if (npc.getName().equals("Zombified Spawn"))
+		{
+			timers.setTimerEnd(client.getLocalPlayer(), TimerType.FREEZE,
+					System.currentTimeMillis());
+		}
 	}
 
-	private void remove(Actor actor)
+	private boolean isAtVorkath()
 	{
-		freezes.remove(actor.getName());
+		return ArrayUtils.contains(client.getMapRegions(), VORKATH_REGION);
 	}
 
-
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
index cb34ccb825..173b2ff6c0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
@@ -221,13 +221,9 @@ public class VorkathPlugin extends Plugin
 				vorkath.updatePhase(Vorkath.Phase.FIRE_BALL);
 				vorkath.setAttacksLeft(vorkath.getAttacksLeft() - 1);
 			}
-			else if (vorkathAttack == VorkathAttack.FREEZE_BREATH && vorkath.getLastAttack() != VorkathAttack.ZOMBIFIED_SPAWN)
+			else if (vorkathAttack == VorkathAttack.FREEZE_BREATH || vorkathAttack == VorkathAttack.ZOMBIFIED_SPAWN)
 			{
 				vorkath.updatePhase(Vorkath.Phase.SPAWN);
-				vorkath.setAttacksLeft(vorkath.getAttacksLeft() - (vorkath.getAttacksLeft() / 2));
-			}
-			else if (vorkathAttack == VorkathAttack.ZOMBIFIED_SPAWN || (vorkath.getLastAttack() == VorkathAttack.ZOMBIFIED_SPAWN))
-			{
 				vorkath.setAttacksLeft(0);
 			}
 			else