From 37281109fb07c8a3377a88dc89122f4ed4409107 Mon Sep 17 00:00:00 2001
From: Neon <neon@beyond-aion.com>
Date: Sun, 3 Nov 2024 23:42:47 +0100
Subject: [PATCH] Improved countermeasures for teleport skill exploits

---
 .../aionemu/gameserver/network/aion/clientpackets/CM_MOVE.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game-server/src/com/aionemu/gameserver/network/aion/clientpackets/CM_MOVE.java b/game-server/src/com/aionemu/gameserver/network/aion/clientpackets/CM_MOVE.java
index 4d3f11412..320f134b8 100644
--- a/game-server/src/com/aionemu/gameserver/network/aion/clientpackets/CM_MOVE.java
+++ b/game-server/src/com/aionemu/gameserver/network/aion/clientpackets/CM_MOVE.java
@@ -177,7 +177,8 @@ private boolean handleBogusPacket(Player player) {
 			 * Sending a move packet with the current server-side position works around this client bug and the client will not move you to your target's
 			 * position.
 			 */
-			sendPacket(type == 0 ? new SM_FORCED_MOVE(player, player) : new SM_MOVE(player));
+			boolean moveForcefully = type == 0 || (type & MovementMask.MANUAL) == MovementMask.MANUAL && (type & MovementMask.POSITION) == MovementMask.POSITION;
+			sendPacket(moveForcefully ? new SM_FORCED_MOVE(player, player) : new SM_MOVE(player));
 			return true;
 		}
 		return false;