From 86e7b93b3b8d9b3f2e2d3cf6c6c46b6df0b1be85 Mon Sep 17 00:00:00 2001
From: ipkpjersi <33754783+ipkpjersi@users.noreply.github.com>
Date: Fri, 20 Sep 2024 20:39:27 -0400
Subject: [PATCH] Fixed magic attacks running up to NPCs and Players (#642)

* Fixed magic attacks running up to NPCs

* Fixed player running up to players when casting magic

* Updated comment
---
 .../rs2/game/content/combat/CombatAssistant.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java
index 91377b7c..5ac1a31e 100644
--- a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java	
+++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java	
@@ -410,6 +410,9 @@ public class CombatAssistant {
 					|| !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 7) && (player.usingBow || player.usingMagic)) {
 				return;
 			} else {
+				if (player.usingMagic || player.usingBow || player.usingRangeWeapon) {
+					player.followId2 = 0;
+				}
 				player.stopMovement();
 			}
 		}
@@ -443,6 +446,9 @@ public class CombatAssistant {
 					|| !player.goodDistance(player.getX(), player.getY(), PlayerHandler.players[i].getX(), PlayerHandler.players[i].getY(), 10) && (player.usingBow || player.usingMagic)) {
 				return;
 			} else {
+				if (player.usingMagic || player.usingBow || player.usingRangeWeapon) {
+					player.followId = 0;
+				}
 				player.stopMovement();
 			}
 		}
@@ -566,6 +572,9 @@ public class CombatAssistant {
 						|| !player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 8) && (player.usingBow || player.usingMagic)) {
 					return;
 				} else {
+					if (player.usingMagic || player.usingBow || player.usingRangeWeapon) {
+						player.followId2 = 0;
+					}
 					player.stopMovement();
 				}
 
@@ -865,6 +874,10 @@ public class CombatAssistant {
 						resetPlayerAttack();
 					}
 					return;
+				} else {
+					if (player.usingMagic || player.usingBow || player.usingRangeWeapon) {
+						player.followId = 0;
+					}
 				}
 
 				if (!usingCross
@@ -1040,7 +1053,8 @@ public class CombatAssistant {
 								MagicSpells.getStartDelay(player));
 					}
 					if (player.autocastId > 0) {
-						player.followId = player.playerIndex;
+						//We don't need to set the followId if they are already autocasting, setting followId here makes a manual cast (when autocast is set) run up to the player.
+						//player.followId = player.playerIndex;
 						player.followDistance = 5;
 					}
 					player.hitDelay = getHitDelay();