From b5daa2c12b79d9da952bef692f52e99673721054 Mon Sep 17 00:00:00 2001 From: PouffyDev <99536749+pouffy@users.noreply.github.com> Date: Thu, 24 Jul 2025 22:19:16 +0100 Subject: [PATCH] Pix possible null value in ElectriciansWrenchItem --- .../configuration_wrench/ElectriciansWrenchItem.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java index abe7a7cb..36a27b31 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java @@ -52,26 +52,22 @@ public class ElectriciansWrenchItem extends Item { public InteractionResult useOn(UseOnContext context) { Level level = context.getLevel(); BlockPos pos = context.getClickedPos(); + Player player = context.getPlayer(); - if(!context.getPlayer().isShiftKeyDown()) { + if(player != null && !player.isShiftKeyDown()) { if (level.getBlockEntity(pos) instanceof IElectric be && be.canBeInGroups()) { be.updateNextTick(); be.sendStuff(); - be.getData().group.id = context.getItemInHand().get(TFMGDataComponents.CONFIGURATION_WRENCH_NUMBER); + be.getData().group.id = context.getItemInHand().getOrDefault(TFMGDataComponents.CONFIGURATION_WRENCH_NUMBER, 0); TFMGUtils.playSound(level, pos, SoundEvents.ITEM_PICKUP, SoundSource.BLOCKS, context.getPlayer()); if(be instanceof ElectricMotorBlockEntity kineticBE) kineticBE.delayedUpdate=true; - - return InteractionResult.SUCCESS; } if (level.getBlockEntity(pos) instanceof AbstractEngineBlockEntity be ) { - be.changeDirection(); return InteractionResult.SUCCESS; - } - }