From 74f75ebfc6c43aa4c32b5fc6b68e76b71f2a8e7f Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Thu, 17 Oct 2024 03:53:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BB=D1=91=D0=B3=D0=BA=D0=B8=D0=B9=20=D0=BD?= =?UTF-8?q?=D1=91=D1=80=D1=84=20=D0=BC=D0=BE=D0=BB=D0=BE=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D1=80=D0=B0=D1=84=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=81=D1=82=D0=B8=D0=BD,=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC?= =?UTF-8?q?=D1=83=D0=BC=20=D1=81=D1=82=D0=B0=D0=BA=20=D0=BD=D0=B0=201=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=BB=D0=BE=D1=82=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/otm/item/tool/ExplosiveHammerItem.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt index 8fcdb6015..72dc1cd38 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt @@ -86,17 +86,16 @@ class ExplosiveHammerItem(durability: Int = 512) : Item(Properties().stacksTo(1) val player = CommonHooks.getCraftingPlayer() ?: return itemStack.copy() if (player.level().isClientSide) return itemStack.copy() - if (!isPrimed(itemStack)) { - itemStack.hurtAndBreak(1, player.level() as ServerLevel, player) {} - } else { - val level = player.level() as ServerLevel + val level = player.level() as ServerLevel + itemStack.hurtAndBreak(8, level, player) {} - itemStack.hurtAndBreak(level.random.nextInt(1, 20), player.level() as ServerLevel, player) {} + if (isPrimed(itemStack)) { + itemStack.hurtAndBreak(level.random.nextInt(1, 20), level, player) {} unprime(itemStack) val (ex, ey, ez) = Vector.atCenterOf(player.blockPosition()) - val exp = Explosion(player.level(), player, ex, ey, ez, 1f, false, if (ToolsConfig.ExplosiveHammer.EXPLOSION_DAMAGE_BLOCKS) Explosion.BlockInteraction.DESTROY_WITH_DECAY else Explosion.BlockInteraction.KEEP) + val exp = Explosion(level, player, ex, ey, ez, 1f, false, if (ToolsConfig.ExplosiveHammer.EXPLOSION_DAMAGE_BLOCKS) Explosion.BlockInteraction.DESTROY_WITH_DECAY else Explosion.BlockInteraction.KEEP) exp.explode() exp.finalizeExplosion(true)