From 87b8fe0c8717ebe141ec8bbbdc9b01bbb79a9d46 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Wed, 4 Aug 2021 11:12:45 -0400
Subject: [PATCH] antidrag: enable in pvp

This feature is enabled in the steam client

Co-authored-by: jsuarez5341 <sealsuarez@gmail.com>
---
 .../plugins/antidrag/AntiDragConfig.java      |  2 +-
 .../plugins/antidrag/AntiDragPlugin.java      | 39 ++++---------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
index 6fa7c3871a..ce2973855f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
@@ -46,7 +46,7 @@ public interface AntiDragConfig extends Config
 	@ConfigItem(
 		keyName = "onShiftOnly",
 		name = "On Shift Only",
-		description = "Configures whether to only adjust the delay while holding shift in non-PvP scenarios. Shift is required in PvP regardless of this config setting",
+		description = "Configures whether to only adjust the delay while holding shift.",
 		position = 2
 	)
 	default boolean onShiftOnly()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
index 1c3952737e..e1b6377612 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
@@ -29,9 +29,7 @@ import java.awt.event.KeyEvent;
 import javax.inject.Inject;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.api.Varbits;
 import net.runelite.api.events.FocusChanged;
-import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WidgetLoaded;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetID;
@@ -69,7 +67,6 @@ public class AntiDragPlugin extends Plugin implements KeyListener
 	@Inject
 	private KeyManager keyManager;
 
-	private boolean inPvp;
 	private boolean shiftHeld;
 	private boolean ctrlHeld;
 
@@ -86,8 +83,7 @@ public class AntiDragPlugin extends Plugin implements KeyListener
 		{
 			clientThread.invokeLater(() ->
 			{
-				inPvp = client.getVar(Varbits.PVP_SPEC_ORB) == 1;
-				if (!config.onShiftOnly() && !inPvp)
+				if (!config.onShiftOnly())
 				{
 					setDragDelay();
 				}
@@ -113,12 +109,12 @@ public class AntiDragPlugin extends Plugin implements KeyListener
 	@Override
 	public void keyPressed(KeyEvent e)
 	{
-		if (e.getKeyCode() == KeyEvent.VK_CONTROL && config.disableOnCtrl() && !(inPvp || config.onShiftOnly()))
+		if (e.getKeyCode() == KeyEvent.VK_CONTROL && config.disableOnCtrl() && !config.onShiftOnly())
 		{
 			resetDragDelay();
 			ctrlHeld = true;
 		}
-		else if (e.getKeyCode() == KeyEvent.VK_SHIFT && (inPvp || config.onShiftOnly()))
+		else if (e.getKeyCode() == KeyEvent.VK_SHIFT && config.onShiftOnly())
 		{
 			setDragDelay();
 			shiftHeld = true;
@@ -128,12 +124,12 @@ public class AntiDragPlugin extends Plugin implements KeyListener
 	@Override
 	public void keyReleased(KeyEvent e)
 	{
-		if (e.getKeyCode() == KeyEvent.VK_CONTROL && config.disableOnCtrl() && !(inPvp || config.onShiftOnly()))
+		if (e.getKeyCode() == KeyEvent.VK_CONTROL && config.disableOnCtrl() && !config.onShiftOnly())
 		{
 			setDragDelay();
 			ctrlHeld = false;
 		}
-		else if (e.getKeyCode() == KeyEvent.VK_SHIFT && (inPvp || config.onShiftOnly()))
+		else if (e.getKeyCode() == KeyEvent.VK_SHIFT && config.onShiftOnly())
 		{
 			resetDragDelay();
 			shiftHeld = false;
@@ -150,7 +146,7 @@ public class AntiDragPlugin extends Plugin implements KeyListener
 				ctrlHeld = false;
 			}
 
-			if (config.onShiftOnly() || inPvp)
+			if (config.onShiftOnly())
 			{
 				shiftHeld = false;
 				clientThread.invoke(this::resetDragDelay);
@@ -162,27 +158,6 @@ public class AntiDragPlugin extends Plugin implements KeyListener
 		}
 	}
 
-	@Subscribe
-	public void onVarbitChanged(VarbitChanged varbitChanged)
-	{
-		boolean currentStatus = client.getVar(Varbits.PVP_SPEC_ORB) == 1;
-
-		if (currentStatus != inPvp)
-		{
-			inPvp = currentStatus;
-
-			if (!inPvp && !config.onShiftOnly())
-			{
-				setDragDelay();
-			}
-			else
-			{
-				resetDragDelay();
-			}
-		}
-
-	}
-
 	@Subscribe
 	public void onFocusChanged(FocusChanged focusChanged)
 	{
@@ -192,7 +167,7 @@ public class AntiDragPlugin extends Plugin implements KeyListener
 			ctrlHeld = false;
 			clientThread.invoke(this::resetDragDelay);
 		}
-		else if (!inPvp && !config.onShiftOnly())
+		else if (!config.onShiftOnly())
 		{
 			clientThread.invoke(this::setDragDelay);
 		}