diff --git a/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt
index 98cc2f513..32295924a 100644
--- a/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt
+++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt
@@ -234,7 +234,7 @@ abstract class CombatSwingHandler(var type: CombatStyle?) {
             entity.debug("Adjusting attack style")
         }
         if (entity.location == victim.location) {
-            return if (entity.index < victim.index && victim.properties.combatPulse.getVictim() === entity) {
+            return if (entity is Player && victim is Player && entity.clientIndex < victim.clientIndex && victim.properties.combatPulse.getVictim() === entity) {
                 InteractionType.STILL_INTERACT
             } else InteractionType.NO_INTERACT
         }