From 4363e79bb1f2fff30a2f2bdc640ca8124ffbf6b0 Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Sat, 27 Jun 2020 16:01:05 +0200
Subject: [PATCH] Reprioritize arrow target player when leaving combat

---
 .../java/net/runelite/mixins/RSClientMixin.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
index 59406e2781..aeed6c743c 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -1208,6 +1208,20 @@ public abstract class RSClientMixin implements RSClient
 		}
 	}
 
+	@FieldHook("combatTargetPlayerIndex")
+	@Inject
+	public static void combatPlayerTargetChanged(int ignored)
+	{
+		if (client.getLocalInteractingIndex() == -1)
+		{
+			final Player p = client.getHintArrowPlayer();
+			if (p != null)
+			{
+				client.setLocalInteractingIndex(p.getPlayerId() & 2047);
+			}
+		}
+	}
+
 	@Inject
 	@Override
 	public boolean hasHintArrow()