From db2616d1c039b3a5fee1150bc2bfcdbc059e09be Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Wed, 3 May 2023 23:38:12 +0100 Subject: [PATCH] Don't (metaphorically) explode on null explosions Closes #1423. --- .../computercraft/shared/turtle/blocks/BlockTurtle.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java b/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java index 1c5e82ca1..76f6138d5 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java +++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java @@ -172,9 +172,9 @@ public class BlockTurtle extends BlockComputerBase implements IWater } @Override - public float getExplosionResistance( BlockState state, IBlockReader world, BlockPos pos, Explosion explosion ) + public float getExplosionResistance( BlockState state, IBlockReader world, BlockPos pos, @Nullable Explosion explosion ) { - Entity exploder = explosion.getExploder(); + Entity exploder = explosion == null ? null : explosion.getExploder(); if( getFamily() == ComputerFamily.ADVANCED || exploder instanceof LivingEntity || exploder instanceof DamagingProjectileEntity ) { return 2000;