From 7f4c9e6462d438ccb34c9a874e5aaeba583ce9dd Mon Sep 17 00:00:00 2001 From: Tooze Date: Wed, 18 Mar 2026 14:44:50 -0400 Subject: [PATCH] read ability --- .../barbassault/arena/monsters/PenanceFighterNPC.kt | 9 ++++++--- .../barbassault/arena/monsters/PenanceRangerNPC.kt | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceFighterNPC.kt b/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceFighterNPC.kt index 42b0cc93a..6576ec305 100644 --- a/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceFighterNPC.kt +++ b/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceFighterNPC.kt @@ -40,9 +40,12 @@ class PenanceFighterNPC : NPCBehavior(*PENANCE_FIGHTER_IDS.toIntArray()) { override fun getXpMultiplier(self: NPC, attacker: Entity): Double { return 0.0 } - override fun beforeDamageReceived( self: NPC, attacker: Entity, state: BattleState) { - attacker as Player - if(!attacker.isArtificial) {state.estimatedHit = BarbAssaultCombat.applyAttackValidation( self, attacker, state )} + override fun beforeDamageReceived(self: NPC, attacker: Entity, state: BattleState) { + val player = attacker as? Player ?: return + + if (!player.isArtificial) { + state.estimatedHit = BarbAssaultCombat.applyAttackValidation(self, player, state) + } } override fun onCreation (self: NPC) { diff --git a/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceRangerNPC.kt b/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceRangerNPC.kt index d61a7265a..6716abd81 100644 --- a/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceRangerNPC.kt +++ b/Server/src/main/content/minigame/barbassault/arena/monsters/PenanceRangerNPC.kt @@ -38,7 +38,9 @@ class PenanceRangerNPC : NPCBehavior(*PENANCE_RANGER_IDS.toIntArray()) { } override fun beforeDamageReceived( self: NPC, attacker: Entity, state: BattleState) { attacker as Player - if(!attacker.isArtificial) {state.estimatedHit = BarbAssaultCombat.applyAttackValidation( self, attacker, state )} + if(!attacker.isArtificial) { + state.estimatedHit = BarbAssaultCombat.applyAttackValidation( self, attacker, state ) + } } override fun getXpMultiplier(self: NPC, attacker: Entity): Double {