Fix TunnelHoleStairESP

Author: cev-api

src/main/java/net/wurstclient/hacks/TunnelHoleStairEspHack.java

@@ -208,8 +208,9 @@ public final class TunnelHoleStairEspHack extends Hack
 	private final ArrayList<AABB> bubbleColumnBoxes = new ArrayList<>();
 	private final ArrayList<AABB> waterColumnBoxes = new ArrayList<>();
 
-	private int scanConfigHash;
-	private int refreshTimerTicks;
+	private int scanConfigHash;
+	private int refreshTimerTicks;
+	private Level activeLevel;
 
 	public TunnelHoleStairEspHack()
 	{
@@ -273,35 +274,58 @@ public String getRenderName()
 	}
 
 	@Override
-	protected void onEnable()
-	{
-		scanConfigHash = getScanConfigHash();
-		refreshTimerTicks = 0;
-		lastAreaSelection = area.getSelected();
-		clearRuntimeState();
-		EVENTS.add(UpdateListener.class, this);
-		EVENTS.add(RenderListener.class, this);
-		EVENTS.add(CameraTransformViewBobbingListener.class, this);
-		EVENTS.add(PacketInputListener.class, this);
+	protected void onEnable()
+	{
+		scanConfigHash = getScanConfigHash();
+		refreshTimerTicks = 0;
+		lastAreaSelection = area.getSelected();
+		activeLevel = null;
+		clearRuntimeState();
+		EVENTS.add(UpdateListener.class, this);
+		EVENTS.add(RenderListener.class, this);
+		EVENTS.add(CameraTransformViewBobbingListener.class, this);
+		EVENTS.add(PacketInputListener.class, this);
 	}
 
 	@Override
-	protected void onDisable()
-	{
-		EVENTS.remove(UpdateListener.class, this);
-		EVENTS.remove(RenderListener.class, this);
-		EVENTS.remove(CameraTransformViewBobbingListener.class, this);
-		EVENTS.remove(PacketInputListener.class, this);
-		clearRuntimeState();
-	}
+	protected void onDisable()
+	{
+		EVENTS.remove(UpdateListener.class, this);
+		EVENTS.remove(RenderListener.class, this);
+		EVENTS.remove(CameraTransformViewBobbingListener.class, this);
+		EVENTS.remove(PacketInputListener.class, this);
+		activeLevel = null;
+		clearRuntimeState();
+	}
 
-	@Override
-	public void onUpdate()
-	{
-		if(MC.player == null || MC.level == null)
-			return;
-		
-		ChunkAreaSetting.ChunkArea currentAreaSelection = area.getSelected();
+	@Override
+	public void onUpdate()
+	{
+		if(MC.player == null || MC.level == null)
+		{
+			// Clear stale detections while disconnecting or switching worlds.
+			if(activeLevel != null || !detectionsByChunk.isEmpty()
+				|| !holeBoxes.isEmpty() || !tunnelBoxes.isEmpty()
+				|| !stairBoxes.isEmpty() || !ladderBoxes.isEmpty()
+				|| !bubbleColumnBoxes.isEmpty()
+				|| !waterColumnBoxes.isEmpty())
+			{
+				activeLevel = null;
+				clearRuntimeState();
+			}
+			return;
+		}
+		
+		if(activeLevel != MC.level)
+		{
+			activeLevel = MC.level;
+			refreshTimerTicks = 0;
+			lastAreaSelection = area.getSelected();
+			scanConfigHash = getScanConfigHash();
+			clearRuntimeState();
+		}
+		
+		ChunkAreaSetting.ChunkArea currentAreaSelection = area.getSelected();
 
 		if(currentAreaSelection != lastAreaSelection)
 		{