From 1a825edda349a51de1feeed0a1d00351a23e8e1f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 14 Mar 2020 00:47:54 +0100 Subject: [PATCH] Fixed bamboo being stupid, also updated Forge Closes #89 --- build.gradle | 2 +- .../naturesaura/chunk/effect/PlantBoostEffect.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 33efc888..de35c0bb 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.15.2-31.0.14' + minecraft 'net.minecraftforge:forge:1.15.2-31.1.19' compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java index aa67bf09..3da92895 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java @@ -73,8 +73,13 @@ public class PlantBoostEffect implements IDrainSpotEffect { if (block instanceof IGrowable && !(block instanceof DoublePlantBlock) && !(block instanceof TallGrassBlock) && block != Blocks.GRASS_BLOCK) { IGrowable growable = (IGrowable) block; if (growable.canGrow(world, plantPos, state, false)) { - growable.grow((ServerWorld) world, world.rand, plantPos, state); - + try { + growable.grow((ServerWorld) world, world.rand, plantPos, state); + } catch (Exception e) { + // Vanilla issue causes bamboo to crash if grown close to world height + if (!(growable instanceof BambooBlock)) + throw e; + } BlockPos closestSpot = IAuraChunk.getHighestSpot(world, plantPos, 25, pos); IAuraChunk.getAuraChunk(world, closestSpot).drainAura(closestSpot, 3500);