From 26a41c5055586b9fa97b1e91cb74f017414e6d70 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 30 Jan 2020 13:45:19 +0100 Subject: [PATCH 1/2] Fixed end flowers crashing when being spawned Closes #73 --- build.gradle | 6 +++--- .../de/ellpeck/naturesaura/blocks/BlockDimensionRail.java | 2 +- .../java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f0d1952e..a41c1aa3 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ minecraft { property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' + property 'forge.logging.console.level', 'info' mods { naturesaura { @@ -46,7 +46,7 @@ minecraft { property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' + property 'forge.logging.console.level', 'info' mods { naturesaura { @@ -62,7 +62,7 @@ minecraft { property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' + property 'forge.logging.console.level', 'info' args '--mod', 'naturesaura', '--all', '--output', file('src/generated/resources/') diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java index 13b3506d..432ed698 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java @@ -129,7 +129,7 @@ public class BlockDimensionRail extends AbstractRailBlock implements IModItem, I World overworld = server.getWorld(goalDimType); BlockPos spawn = overworld.getSpawnPoint(); BlockPos ret = new BlockPos(spawn.getX(), 0, spawn.getZ()); - return ret.up(overworld.getHeight(Heightmap.Type.WORLD_SURFACE_WG, spawn.getX(), spawn.getZ())); + return ret.up(overworld.getHeight(Heightmap.Type.WORLD_SURFACE, spawn.getX(), spawn.getZ())); } } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java index d8c9d795..5a9fd4e6 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java @@ -60,7 +60,7 @@ public class BlockEndFlower extends BushBlock implements IModItem, IModelProvide for (int i = 0; i < 6; i++) { int x = dragon.world.rand.nextInt(256) - 128; int z = dragon.world.rand.nextInt(256) - 128; - BlockPos pos = new BlockPos(x, dragon.world.getHeight(Heightmap.Type.WORLD_SURFACE_WG, x, z), z); + BlockPos pos = new BlockPos(x, dragon.world.getHeight(Heightmap.Type.WORLD_SURFACE, x, z), z); if (!dragon.world.isBlockLoaded(pos)) continue; if (dragon.world.getBlockState(pos.down()).getBlock() != Blocks.END_STONE) From 9b1f21c6c38e79ace033db753c2f014e88701937 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 30 Jan 2020 13:47:10 +0100 Subject: [PATCH 2/2] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a41c1aa3..f73d0f47 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '20.0' +version = '20.1' group = 'de.ellpeck.naturesaura' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'NaturesAura'