From 386b65799a156a122f90fddb08c6e77a8f7dcae9 Mon Sep 17 00:00:00 2001 From: ceikry Date: Sat, 31 Jul 2021 20:35:29 -0500 Subject: [PATCH] Quick preemptive bugfix --- .../game/node/entity/combat/handlers/MeleeSwingHandler.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt index 86e048129..3b8346b79 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt @@ -158,7 +158,7 @@ open class MeleeSwingHandler effectiveAttackLevel += 6 } - if(entity is Player && (entity.properties.combatPulse.getVictim()?.id ?: 0) in entity.slayer.task.ids) + if(entity is Player && entity.slayer.task?.ids?.contains((entity.properties.combatPulse?.getVictim()?.id ?: 0)) == true) effectiveAttackLevel *= SlayerEquipmentFlags.getDamAccBonus(entity) //Slayer Helm/ Black Mask/ Slayer cape else if (entity is Player //Salve amulet @@ -191,7 +191,7 @@ open class MeleeSwingHandler cumulativeStr *= getSetMultiplier(entity, Skills.STRENGTH) - if(entity is Player && (entity.properties.combatPulse.getVictim()?.id ?: 0) in entity.slayer.task.ids) + if(entity is Player && entity.slayer.task?.ids?.contains((entity.properties.combatPulse?.getVictim()?.id ?: 0)) == true) cumulativeStr *= SlayerEquipmentFlags.getDamAccBonus(entity) //Slayer helm/black mask/skillcape /*val hit = (16 + cumulativeStr + bonus / 8 + cumulativeStr * bonus * 0.016865) * modifier