From 1125d36e0e9d25f4f091e47b1c4219dc5908eaec Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:10:29 -0700 Subject: [PATCH] Fix serverside crash when sprinting on Infested Leaves --- .../thedarkcolour/exdeorum/block/InfestedLeavesBlock.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/thedarkcolour/exdeorum/block/InfestedLeavesBlock.java b/src/main/java/thedarkcolour/exdeorum/block/InfestedLeavesBlock.java index e61d73d9..3e941e49 100644 --- a/src/main/java/thedarkcolour/exdeorum/block/InfestedLeavesBlock.java +++ b/src/main/java/thedarkcolour/exdeorum/block/InfestedLeavesBlock.java @@ -25,7 +25,6 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; @@ -39,6 +38,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.HitResult; + +import net.neoforged.api.distmarker.Dist; +import net.neoforged.fml.loading.FMLEnvironment; import org.jetbrains.annotations.Nullable; import thedarkcolour.exdeorum.blockentity.InfestedLeavesBlockEntity; import thedarkcolour.exdeorum.client.RenderUtil; @@ -76,7 +78,6 @@ public class InfestedLeavesBlock extends LeavesBlock implements EntityBlock { } } - @Nullable @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { return new InfestedLeavesBlockEntity(pos, state); @@ -101,13 +102,13 @@ public class InfestedLeavesBlock extends LeavesBlock implements EntityBlock { public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { if (decaying(state)) { // doesn't drop unless crook - //dropResources(state, level, pos); level.removeBlock(pos, false); } } @Override public RenderShape getRenderShape(BlockState pState) { + if (FMLEnvironment.dist == Dist.DEDICATED_SERVER) return RenderShape.MODEL; return (EConfig.CLIENT_SPEC.isLoaded() && EConfig.CLIENT.useFastInfestedLeaves.get()) || RenderUtil.IRIS_ACCESS.areShadersEnabled() ? RenderShape.MODEL : RenderShape.INVISIBLE; } } \ No newline at end of file