From 8019bee4300630e0957e09069eeac9aa38ffb1da Mon Sep 17 00:00:00 2001 From: LeoDog896 Date: Mon, 22 Nov 2021 18:27:24 -0500 Subject: [PATCH] Cleanup --- .../world/cepi/itemextension/combat/events/CombatHandler.kt | 2 +- .../kotlin/world/cepi/itemextension/combat/util/KnockBack.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt b/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt index 723564ee..f9e12df1 100644 --- a/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt +++ b/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt @@ -209,7 +209,7 @@ object CombatHandler { (target as LivingEntity).damage(DamageType.fromEntity(entity), cepiItem?.get()?.damage ?: 1.0f) // Apply knockback to the entity - target.applyKnockback(entity, cepiItem?.get()?.amount ?: 1.0f) + target.applyKnockback(entity, cepiItem?.get()?.amount ?: 0f) if (entity is EquipmentHandler) entity.useAttackSpeed((entity as EquipmentHandler).itemInMainHand) diff --git a/src/main/kotlin/world/cepi/itemextension/combat/util/KnockBack.kt b/src/main/kotlin/world/cepi/itemextension/combat/util/KnockBack.kt index 346c892e..a77ed486 100644 --- a/src/main/kotlin/world/cepi/itemextension/combat/util/KnockBack.kt +++ b/src/main/kotlin/world/cepi/itemextension/combat/util/KnockBack.kt @@ -6,7 +6,7 @@ import kotlin.math.cos import kotlin.math.sin -fun Entity.applyKnockback(attacker: Entity, extra: Float = 1.0f) { +fun Entity.applyKnockback(attacker: Entity, extra: Float = 0f) { val verticalKnockback = 0.4 * 20 val horizontalKnockback = 0.4 * 20 val extraHorizontalKnockback = 0.3 * 20