Fixed a bug where an NPC could not attack an entity that was already set as their target

Fixed a regression that prevents some NPCs from walking back to their spawn point
Fixed a longstanding issue that didn't properly reset NPCs who wandered too far out of their natural movement radius (now disables combat + walks them back to their spawn point + fully heals them)

Server/src/main/java/core/game/node/entity/npc/NPC.java

@@ -412,13 +412,42 @@ public class NPC extends Entity {
 	 */
 	public void handleTickActions() {
 		if (!getLocks().isInteractionLocked()) {
-			if (!pathBoundMovement && walkRadius > 0 && !getLocation().withinDistance(getProperties().getSpawnLocation(), walkRadius)) {
+			if (!getLocks().isMovementLocked()) {
-				if(!isNeverWalks()){
+				if (
-					if(walkRadius == 0)
+						!pathBoundMovement
-						walkRadius = 3;
+						&& walkRadius > 0
+						&& !getLocation().withinDistance(getProperties().getSpawnLocation(), (int)(walkRadius * 1.5))
+					)	
+				{
+					if(!isNeverWalks()){
+						if(walkRadius == 0)
+							walkRadius = 3;
+					}
+					if (aggressiveHandler != null) {
+						aggressiveHandler.setPauseTicks(walkRadius + 1);
+					}
+					nextWalk = GameWorld.getTicks() + walkRadius + 1;
+					getLocks().lockMovement(100);
+					getImpactHandler().setDisabledTicks(100);
+					setAttribute("return-to-spawn", true);
+					GameWorld.getPulser().submit(new MovementPulse(this, getProperties().getSpawnLocation(), Pathfinder.SMART) {
+						@Override
+						public boolean pulse() {
+							getProperties().getCombatPulse().stop();
+							getLocks().unlockMovement();
+							fullRestore();
+							getImpactHandler().setDisabledTicks(0);
+							removeAttribute("return-to-spawn");
+							return true;
+						}
+					});
+					return;
 				}
-				if (aggressiveHandler != null) {
+				if (dialoguePlayer == null || !dialoguePlayer.isActive() || !dialoguePlayer.getInterfaceManager().hasChatbox()) {
-					aggressiveHandler.setPauseTicks(walkRadius + 1);
+					dialoguePlayer = null;
+					if (walks && !getPulseManager().hasPulseRunning() && !getProperties().getCombatPulse().isAttacking() && !getProperties().getCombatPulse().isInCombat() && nextWalk < GameWorld.getTicks()) {
+						if (walkToNextDest()) return;
+					}
 				}
 			}
 			if (aggressive && aggressiveHandler != null && aggressiveHandler.selectTarget()) {
@@ -428,29 +457,26 @@ public class NPC extends Entity {
 				return;
 			}
 		}
-		if (!getLocks().isMovementLocked()) {
-			if (dialoguePlayer == null || !dialoguePlayer.isActive() || !dialoguePlayer.getInterfaceManager().hasChatbox()) {
-				dialoguePlayer = null;
-				if (walks && !getPulseManager().hasPulseRunning() && !getProperties().getCombatPulse().isAttacking() && !getProperties().getCombatPulse().isInCombat() && nextWalk < GameWorld.getTicks()) {
-					if (RandomFunction.nextBool()) return;
-					setNextWalk();
-					Location l = getMovementDestination();
-					if (canMove(l)) {
-						if((Boolean) definition.getHandlers().getOrDefault("water_npc",false)){
-							Pathfinder.findWater(this,l,true,Pathfinder.DUMB).walk(this);
-						} else {
-							Pathfinder.find(this, l, true, Pathfinder.DUMB).walk(this);
-						}
-					}
-				}
-			}
-		}
 		if (forceTalk != null && getAttribute("lastForceTalk", 0) < GameWorld.getTicks()) {
 			sendChat(forceTalk);
 			setAttribute("lastForceTalk", GameWorld.getTicks() + RandomFunction.random(15, 30));
 		}
 	}
 
+	private boolean walkToNextDest() {
+		if (RandomFunction.nextBool()) return true;
+		setNextWalk();
+		Location l = getMovementDestination();
+		if (canMove(l)) {
+			if((Boolean) definition.getHandlers().getOrDefault("water_npc",false)){
+				Pathfinder.findWater(this,l,true,Pathfinder.DUMB).walk(this);
+			} else {
+				Pathfinder.find(this, l, true, Pathfinder.DUMB).walk(this);
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Sets the next walk.
 	 */

Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java

@@ -90,15 +90,13 @@ public final class AggressiveHandler {
 		}
 		if (target != null) {
 			target.setAttribute("aggressor", entity);
-			if (target != entity.getProperties().getCombatPulse().getVictim()) {
+			if (entity.getProperties().getCombatPulse().isAttacking()) {
-				if (entity.getProperties().getCombatPulse().isAttacking()) {
+				entity.getProperties().getCombatPulse().setVictim(target);
-					entity.getProperties().getCombatPulse().setVictim(target);
+				entity.face(target);
-					entity.face(target);
+			} else {
-				} else {
+				entity.getProperties().getCombatPulse().attack(target);
-					entity.getProperties().getCombatPulse().attack(target);
-				}
-				return true;
 			}
+			return true;
 		}
 		return entity.getProperties().getCombatPulse().isAttacking();
 	}

Server/src/main/kotlin/rs09/game/node/entity/combat/CombatPulse.kt

@@ -286,7 +286,8 @@ class CombatPulse(
                     victim.skills.updateLevel(Skills.DEFENCE, -drain, victim.skills.getStaticLevel(Skills.DEFENCE) - drain)
                 }
             }
-            victim.walkingQueue.reset()
+            if (!victim.locks.isMovementLocked)
+                victim.walkingQueue.reset()
         }
         setVictim(victim)
         entity.onAttack(victim as Entity?)

Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt

@@ -210,6 +210,10 @@ abstract class CombatSwingHandler(var type: CombatStyle?) {
      * @return `True` if so.
      */
     open fun isAttackable(entity: Entity, victim: Entity): InteractionType? {
+        if (victim.getAttribute("return-to-spawn", false)) {
+            return InteractionType.NO_INTERACT
+        }
+
         if (type == CombatStyle.MELEE) {
             val stepType = canStepTowards(entity, victim)
             if (stepType != InteractionType.STILL_INTERACT) return stepType